Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD

@@ -23,9 +23,13 @@ build() {
   export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
   
   msg "Starting autoconf..."
-  cd "$srcdir/$cmpdir"
+  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..."

arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD

@@ -29,13 +29,13 @@ build() {
   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 \
-     --enable-torrent-mimetype \
      --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
      --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
 

arch/3.5.13/trinity-base/hal/PKGBUILD

@@ -16,7 +16,8 @@ options=('!libtool' '!makeflags')
 install=hal.install
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
          hald
-         hal.patch)
+         hal.patch
+         udev-update.patch)
 #        patches/hal-0.5.9-hide-diagnostic.patch
 #        patches/hal-remove-dell-killswitch.patch
 #        patches/hal-KVM-evdev.patch
@@ -32,7 +33,8 @@ source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
 
 md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
          '4cdfc673ad65ddb51919f5a757f62145'
-         '185dd5d6ffc703ec8395b4eb3a1ae498')
+         '185dd5d6ffc703ec8395b4eb3a1ae498'
+         'cad3564de1708603c7a1e0facf6b1921')
 #         '4d4b6801a1cedca22b8bdd9db73b16fb'
 #         '6d87c3e63184ae3a69caafc846f538a3'
 #         '6507e5091ee2d11a87ae738a8e2caecb'
@@ -50,7 +52,7 @@ build() {
    cd $srcdir
   patch -Np1 -d ${srcdir} < hal.patch
   cd "${srcdir}/${pkgname}-${pkgver}"
-#  patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch"
+  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"
@@ -82,11 +84,11 @@ build() {
 }
 
 package() {
-   cd $srcdir/${pkgname}-${pkgver}
+  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/"
+  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}/"

arch/3.5.13/trinity-base/hal/udev-update.patch

@@ -0,0 +1,26 @@
+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;

arch/3.5.13/trinity-base/mkpkg

@@ -0,0 +1,15 @@
+#!/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

arch/3.5.13/trinity-base/trinity-arts/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-arts
 pkgver=3513
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.com'
 license=('GPL')
@@ -15,21 +15,15 @@ depends=('trinity-tqtinterface'
 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'
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz')
-        'trinity.profile.sh' 'trinity.profile.csh')
+md5sums=('109124dabb1aaa9d44eb32e43b549142')
-md5sums=('109124dabb1aaa9d44eb32e43b549142'
-         '72c6c4fb492c1f4b4741fad1dd70d62f'
-         '915e14c6264a6b9c46a6a20b16cdcd06')
 install='trinity-arts.install'
 
-_prefix="/opt/trinity"
-
 build() {
-
-   # Do we need this?
    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"
@@ -38,7 +32,7 @@ build() {
 
    msg "Starting cmake..."
    cmake ${srcdir}/dependencies/arts/ \
-      -DCMAKE_INSTALL_PREFIX=${_prefix}
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR}
 
    msg "Building $pkgname..."
    make
@@ -49,26 +43,6 @@ package() {
    msg "Packaging - $pkgname-$pkgver"
 
    cd ${srcdir}/build
-
    make DESTDIR="$pkgdir" install
 
-   # since this is first package to provide
-   # binaries, include headers and libs from trinity
-   # 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 $_prefix/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
-   echo $_prefix/lib/kde >> $pkgdir/etc/ld.so.conf.d/trinity.conf
-
-   # Install profiles
-   install -D -m644 $srcdir/trinity.profile.sh $pkgdir/etc/profile.d/trinity.sh
-   install -D -m644 $srcdir/trinity.profile.csh $pkgdir/etc/profile.d/trinity.csh
-
 }

arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD

@@ -16,40 +16,34 @@ 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')
 
-_prefix="/opt/trinity"
-
 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
 
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  . /etc/profile.d/qt3.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=${_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON 
-
-  msg "Building - $pkgname..."
-  make
-#     -DWITH_QT3=ON \
-#     -DQTDIR=/opt/qt \
-#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
+   msg "Packaging - $pkgname-$pkgver"
 #   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
+   cd ${srcdir}/build
-  make DESTDIR="${pkgdir}" install
+   make DESTDIR="${pkgdir}" install
 }

arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD

@@ -9,7 +9,7 @@ url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity TQt DBus wrapper"
-depends=('trinity-tqtinterface' 'dbus-core')
+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)
@@ -17,7 +17,6 @@ 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 

arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD

@@ -0,0 +1,216 @@
+# 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
+}

arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh

@@ -0,0 +1,13 @@
+#!/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

arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh

@@ -0,0 +1,19 @@
+# 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

arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity

@@ -0,0 +1,40 @@
+#!/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

arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install

@@ -0,0 +1,19 @@
+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
+}
+

arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop

@@ -0,0 +1,8 @@
+[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
+

arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD

@@ -1,31 +1,30 @@
 # Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 
-pkgname=trinity-kdebase
+pkgname='trinity-kdebase'
 pkgver=3513
-pkgrel=4
+pkgrel=7
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity Desktop Enviroment base components"
-depends=('trinity-dbus-tqt' 'trinity-kdelibs' 'hal'
+depends=('trinity-kdelibs' 'trinity-dbus-tqt' 'hal'
-         'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-iceauth'
+         'libxtst' 'libraw1394')
-         'libxtst')
+         #'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 
-         # 'libltdl'
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient' 
-         # 'openexr'
+             'libxkbfile')
-         # 'libxkbfile'
+confilicts=('kdemod3-kdebase')
-
+options=('libtool')
-makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf')
 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')
+            'xorg-fonts-75dpi: X.org 75dpi fonts collection'
-confilicts=('kdemod3-kdebase')
+            'samba: file sharing over SMB')
-options=('libtool')
+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'
+        'xsession.patch'
         'arch-kdeshutdown.png'
         'kdm-default-face.png'
         'agent-shutdown.sh'
@@ -33,7 +32,7 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz'
         'kdm-trinity' 
         'trinity.desktop')
 md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
-         'bf0cc14276148d5f6bd46828367825a6'
+         '327e4d68bd1fc4d29bdb273e81f90415'
          '895f5d7351aa73ba1f57b0ad27081d69'
          'bb3004513d703d6b72ce70aa240af3a3'
          'e6afdd7ca60c4c59b851135785347e75'
@@ -41,7 +40,6 @@ md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
          'c963ef6e37c9051119972a58c67f05fb'
          '376d85d213cf3c04cb0912e5cccd68bd'
          '1418e45fea5a9738544cbd264c36373b')
-install='trinity-kdebase.install'
 
 build() {
    cd $srcdir/kdebase
@@ -53,7 +51,7 @@ build() {
 
    #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/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH
+   #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..."
@@ -67,20 +65,14 @@ build() {
    #sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt
 
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
+   mkdir -p ../build
-   cd build
+   cd ../build
 
    msg "Starting cmake..."
-   cmake ${srcdir}/kdebase --debug-output \
+   cmake ${srcdir}/kdebase \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DCMAKE_VERBOSE_MAKEFILE=ON \
-      -DQT_VERSION=3 \
       -DSYSCONF_INSTALL_DIR=/etc \
       -DWITH_XFIXES=ON \
-      -DWITH_HAL=ON \
-      -DWITH_ARTS=ON \
-      -DWITH_SASL=ON \
-      -DWITH_OPENEXR=ON \
       -DWITH_XCOMPOSITE=ON \
       -DWITH_XCURSOR=ON \
       -DWITH_XRANDR=ON \
@@ -91,33 +83,46 @@ build() {
       -DWITH_XINERAMA=ON \
       -DWITH_XEXT=ON \
       -DWITH_PAM=ON \
-      -DBUILD_ALL=ON \
+      -DWITH_HAL=ON \
-      -DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0
+      -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
+   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
+   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 ${pkgdir}$TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity
+   ln -sf $TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity
 
-   # 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	
-   
    # install mkpamserv script, so we can auto-generate pam.d configs in post_install()
    install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
 
@@ -125,11 +130,6 @@ package() {
    # 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.
 
-   # 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
-
    # 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
 
@@ -147,4 +147,5 @@ package() {
       cd ..
    done
 
+
 }

arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install

@@ -1,9 +1,9 @@
 post_install() {
    ldconfig &> /dev/null
    mkpamserv trinity
-   echo "Please remember that you can change your kdesu backend"
+   echo "Please remember that you can change your kdesu backend from su to sudo"
-   echo "from su to sudo by adding following lines to your"
+   echo "by adding following lines to your ~/.trinity/share/kdesurc or to the"
-   echo "~/.trinity/share/kdesurc or to $TDEDIR/share/config/kdesurc:"
+   echo "$TDEDIR/share/config/kdesurc:"
    echo "[super-user-command]"
    echo "super-user-command=sudo"
 }

arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch

@@ -0,0 +1,28 @@
+--- /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."
++	

arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD

@@ -3,13 +3,13 @@
 
 pkgname=trinity-kdelibs
 pkgver=3513
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity DE core libraries"
-depends=('trinity-arts'
+depends=('trinity-arts' 'xorg-iceauth'
          'libxslt' 'libidn' 'libart-lgpl' 'jasper' 
          'libxcomposite' 'libcups' 'libutempter'
          'openexr' 'aspell' 'hspell') 
@@ -35,7 +35,7 @@ build() {
    # 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:${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..."

arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD

@@ -22,12 +22,14 @@ md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
 build() {
    cd ${srcdir}/PyQt-x11-gpl-${pkgver}
 
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
+
    msg "Starting configure..."
-   . /etc/profile.d/qt3.sh
 
    export QMAKESPEC="/opt/qt/mkspecs/default"
 
-   echo yes | python2.7 configure.py -q /opt/qt/
+   echo yes | python2.7 configure.py -q ${QTDIR}
 
    msg "Building ${pkgname}..."
    make

arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD

@@ -9,11 +9,19 @@ arch=('i686' 'x86_64')
 url="http://trinitydesktop.org"
 license=('GPL')
 groups=('trinity-base')
-depends=('libpng' 'libjpeg' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 
+depends=('libpng' 'libjpeg' 'libxmu' 'libmng' 'postgresql-libs'
-         'libxft' 'libxrandr')
+         'libxcursor' 'libxinerama' 'mesa' 'libxft' 'libxrandr'
-makedepends=('mysql' 'postgresql' 'sqlite3' 'unixodbc' 'libmng' 'libxi')
+         'libmysqlclient')
-             # cups [add for cups support, add -cups to ./configure opts]
+makedepends=('libxi' 'postgresql' 'unixodbc' 'libcups')
-optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
+             #'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')
@@ -21,21 +29,40 @@ 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'
-         'de4d95f8d236ecc85bad4876efd8fdf0')
+         '71d5f647da82d2a6f5e0e13549f1e865')
 
 _prefix="/opt/qt3"
 
 build() {
-   msg "Patching source code..."
-
    cd $srcdir/qt3
 
-   # apply other qt patches from debian/gentoo and kde
+   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/" 
@@ -44,50 +71,42 @@ build() {
    export QMAKESPEC=$QTDIR/mkspecs/linux-g++
 
    if [ "$CARCH" = "x86_64" ]; then
-     export ARCH="-64"
+      export ARCH="-64"
    else unset ARCH
    fi
-
+   
-   cd "${srcdir}/qt3"
+   # 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*}
 
-   sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
-   rm -rf doc/html examples tutorial
-   sed -i "s|sub-tutorial sub-examples||" Makefile
-   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 "Starting configure..."
-   #make -C qmake || return 1
    ./configure \
       -prefix ${_prefix} \
-      -platform linux-g++${ARCH} \
       -sysconfdir /etc/qt \
-      -release \
+      -I/usr/include/mysql \
-      -sm \
+      -I/usr/include/postgresql/server \
-      -nis \
+      -lpq \
-      -stl \
+      -lmysqlclient \
-      -no-g++-exceptions \
+      -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 \
-      -shared \
       -dlopen-opengl \
-      -no-ipv6 \
+      -no-ipv6
-      -system-zlib \
-      -{system-lib,plugin-imgfmt-}{png,jpeg,mng} \
-      -qt-gif \
-      -xinerama \
-      -xcursor \
-      -xrender \
-      -xft \
-      -plugin-sql-{mysql,psql,sqlite,odbc}
 
    # 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
@@ -98,20 +117,19 @@ build() {
    msg "Building - $pkgname..."
 
    # build sql plugins
-   cd "${srcdir}"/qt3
+   # do we need this, I don't think so.
-   make -C qmake
+   #cd "${srcdir}"/qt3
-   cd "${srcdir}"/qt3/plugins/src/sqldrivers/mysql
+   #make -C qmake
-   "${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+   #cd "${srcdir}"/qt3/plugins/src/sqldrivers/mysql
-   cd "${srcdir}"/qt3/plugins/src/sqldrivers/psql
+   #"${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-   "${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.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
 
-   # fix the broken makefiles
+   # build rest, but without tutorials and examples
-   # sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
+   # of you want them, remove sub-tools
-
+   make sub-tools
-   # build rest
-   make
 
 }
 
@@ -121,24 +139,24 @@ package() {
 
    make INSTALL_ROOT="$pkgdir" install
 
-   msg "Cleaning package..."
+   # install qmake
-
-   rm -rf "${pkgdir}"$_prefix/{phrasebooks,templates,translations}
-   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
-
-   sed -ie 's/define QTIMER_H/&\n#include "qglobal.h"/g' $pkgdir$_prefix/include/qtimer.h
-
    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
@@ -150,20 +168,25 @@ package() {
    echo "export PATH+=:${_prefix}/bin" >> ${pkgdir}/etc/profile.d/qt3.sh
    echo "export PKG_CONFIG_PATH+=:${_prefix}/pkgconfig" >> ${pkgdir}/etc/profile.d/qt3.sh
 
-   # ln -sf $_prefix/bin/qtconfig "${pkgdir}"$_prefix/bin/qt3config
+   msg "Cleaning package..."
 
-   # install man pages
+   #rm -rf "${pkgdir}"$_prefix/{phrasebooks,templates,translations}
-   install -d -m755 "${pkgdir}"$_prefix/man
+   
-   cp -r "${srcdir}"/qt3/doc/man/{man1,man3} "${pkgdir}"$_prefix/man/
+   # 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
 
-   # libtoolslay
+   # Fix issues with GCC4
-   find $startdir/pkg -name '*.la' -exec rm {} \;
+   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
 
-   # Arch64 fix
+   # missing include "qglobal.h" in include/qtimer.h fix
-   #if [ "$CARCH" = "x86_64" ]; then
+   sed -ie 's/define QTIMER_H/&\n#include "qglobal.h"/g' $pkgdir$_prefix/include/qtimer.h
-   #   [ -d $pkgdir$_prefix/mkspecs/linux-g++ ] || mkdir $pkgdir$_prefix/mkspecs/linux-g++
-   #   cd  $pkgdir$_prefix/mkspecs/linux-g++
-   #   ln -s -v ../linux-g++-64/* .
-   #fi
 
 } 

arch/3.5.13/trinity-base/trinity-qt3/qt3.install

@@ -1,12 +1,20 @@
 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() {
-   post_install
+   ldconfig &> /dev/null
 }
 
 post_remove() {
-   post_install
+   ldconfig &> /dev/null
 }
 

arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-tqtinterface
 pkgver=3513
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://trinity.pearsoncomputing.net"
 license=('GPL2')
@@ -14,14 +14,13 @@ 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')
+        'tqtpc-location.patch' 'trinity.profile.sh' 'trinity.profile.csh')
 md5sums=('d54cc9fd0b35555298efd17c32471a2b'
-         'c15745c944d98cb7c4cb553f0ca421d4')
+         'c15745c944d98cb7c4cb553f0ca421d4'
+         '72c6c4fb492c1f4b4741fad1dd70d62f'
+         '915e14c6264a6b9c46a6a20b16cdcd06')
 install='trinity-tqtinterface.install'
 
-# istead of using prefix, we will use QTDIR from qt3 profile
-#_prefix=/opt/qt3
-
 build() {
    msg "Setting PATH, CMAKE and Trinity Environment variables"
    # Source the QT and KDE profile
@@ -34,7 +33,7 @@ build() {
 
    msg "Starting cmake..."
    cmake "../dependencies/tqtinterface" \
-     -DCMAKE_INSTALL_PREFIX=${QTDIR} \
+     -DCMAKE_INSTALL_PREFIX=/opt/trinity \
      -DQT_PREFIX_DIR=${QTDIR} \
      -DQT_INCLUDE_DIR=${QTDIR}/include \
      -DMOC_EXECUTABLE=${QTDIR}/bin/moc \
@@ -56,4 +55,21 @@ package() {
    #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
+
 }

arch/3.5.13/trinity-extras/mkpkg

@@ -0,0 +1,18 @@
+#!/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/
+

arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD

@@ -27,7 +27,7 @@ pkgname=('trinity-i18n-af' 'trinity-i18n-ar' 'trinity-i18n-az'
          'trinity-i18n-uz-cyrillic' 'trinity-i18n-vi' 'trinity-i18n-wa' '
          trinity-i18n-zh_cn' 'trinity-i18n-zh_tw')
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -39,36 +39,34 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kde-i18n-3.5.13.tar.gz)
 md5sums=('7c919c7cb85f454fed46767082a87773')
 
-_prefix=/opt/trinity
-
 build() {
-  msg "Setting Trinity Environment variables"
+   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
+
-  cd $srcdir/kde-i18n
+   cd $srcdir/kde-i18n
-  rm HOW.TO.BUILD TRINITY.RELEASE
+   rm HOW.TO.BUILD TRINITY.RELEASE
-
+
-  for _filename in *.tar.bz2; do
+   for _filename in *.tar.bz2; do
-     _dir=`echo "$_filename" | cut -d'.' -f1-3`
+      _dir=`echo "$_filename" | cut -d'.' -f1-3`
-     _newname=`echo "$_dir" | cut -d'-' -f2-4`
+      _newname=`echo "$_dir" | cut -d'-' -f2-4`
-
+
-     if [ ! -d trinity-${newname} ]; then
+      if [ ! -d trinity-${newname} ]; then
-       msg "Extracting $_filename..."
+         msg "Extracting $_filename..."
-       tar xfj $_filename
+         tar xfj $_filename
-       mv $_dir trinity-${_newname}
+         mv $_dir trinity-${_newname}
-     fi
+      fi
-
+
-     cd trinity-${_newname}
+      cd trinity-${_newname}
-     
+
-     msg "Starting trinity-${_newname} configure..."
+      msg "Starting trinity-${_newname} configure..."
-     ./configure --prefix=${_prefix} > /dev/null
+      ./configure --prefix=${TDEDIR} > /dev/null
-     
+
-     msg "Building trinity-${_newname}..."
+      msg "Building trinity-${_newname}..."
-     make > /dev/null
+      make > /dev/null
-     
+
-     cd ..
+      cd ..
-  done
+   done
 }
 
 package_trinity-i18n-af() {

arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdeaccessibility
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -11,41 +11,41 @@ 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')
 
-_prefix=/opt/trinity
-
 build() {
-
+   msg "Setting Trinity Environment variables"
-  msg "Setting Trinity Environment variables"
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdeaccessibility.patch
   
-  msg "Starting automake..."
+   msg "Starting automake..."
-  cd "$srcdir/kdeaccessibility"
+   cd "$srcdir/kdeaccessibility"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  make -f admin/Makefile.common
+   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} \
+   msg "Starting configure..."
-     --prefix=${_prefix} \
+   ./configure --with-qt-dir=${QTDIR} \
-     --enable-closure \
+      --prefix=${TDEDIR} \
-     --with-alsa \
+      --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+      --with-alsa \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+      --with-extra-includes=${_prefix}/include \
-
+      --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-  msg "Building ${pkgname}..."
+
-  make
+   msg "Building ${pkgname}..."
+   make
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
+   msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kdeaccesibility
+   cd ${srcdir}/kdeaccesibility
-  make DESTDIR="${pkgdir}" install
+   make DESTDIR="${pkgdir}" install
 }

arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD

@@ -19,30 +19,25 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaddons-3.5.13.tar.gz)
 md5sums=('f5fa96a5d99d1bc33600f609881eaee6')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdeaddons.patch
   
   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=${_prefix} \
+     --prefix=${TDEDIR} \
      --enable-closure \
      --with-{sdl,xmms} \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make

arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdeadmin
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -11,38 +11,29 @@ groups=('trinity-extras')
 pkgdesc="Trinity system administration utils"
 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/kdeadmin-3.5.13.tar.gz)
 md5sums=('b8bbabf353070a3e730464e0ce2960e2')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdeadmin.patch
   
   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=${_prefix} \
+     --prefix=${TDEDIR} \
      --enable-closure \
      --with-shadow \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     --with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make

arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdeartwork
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -17,12 +17,8 @@ md5sums=('24f85eb3e5a9106de48a3e81d2575ffe')
 
 build() {
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  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"
@@ -31,7 +27,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/kdeartwork \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DWITH_XSCREENSAVER=ON \
     -DWITH_LIBART=ON \
@@ -45,5 +41,5 @@ package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }

arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdeedu
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,29 +15,25 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeedu-3.5.13.tar.gz)
 md5sums=('37a14a67c4d00babc3015c6a31698cb0')
 
-_prefix=/opt/trinity
-
 build() {
 
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdeedu.patch
   
   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=${_prefix} \
+     --prefix=${TDEDIR} \
-     --enable-closure \
+     --enable-closure
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make

arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdegames
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,29 +15,26 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdegames-3.5.13.tar.gz)
 md5sums=('6c63e161050939f53921bfceb923a19e')
 
-_prefix=/opt/trinity
-
 build() {
 
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
+  
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdegames.patch
   
   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=${_prefix} \
+     --prefix=${TDEDIR} \
-     --enable-closure \
+     --enable-closure
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make

arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdegraphics
 pkgver=3513
-pkgrel=1.0
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.com'
 license=('GPL')
@@ -20,16 +20,10 @@ 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')
 
-_prefix="/opt/trinity"
-
 build() {
    msg "Setting PATH, CMAKE and Trinity Environment variables"
-   . /etc/profile.d/qt3.sh
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-   export CMAKE_PREFIX_PATH=/opt/qt:${_prefix}
-   export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr:/usr/include:/usr/include/lcms
-   export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/usr/lib:$LD_LIBRARY_PATH
-   export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
 
    msg "Patching..."
    patch -p0 -i ${srcdir}/ksnapshot.patch
@@ -41,7 +35,7 @@ build() {
 
    msg "Starting cmake..."
    cmake ${srcdir}/kdegraphics \
-      -DCMAKE_INSTALL_PREFIX=${_prefix} \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
       -DCMAKE_VERBOSE_MAKEFILE=ON \
       -DQT_VERSION=3 \
       -DCMAKE_CXX_FLAGS="-fpermissive" \
@@ -59,8 +53,6 @@ build() {
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-
    make DESTDIR="$pkgdir" install
-
    cd ${startdir}
 }

arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdemultimedia
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,13 +15,10 @@ 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')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
   msg "Patching..."
   patch -p0 -i ${srcdir}/xine_artsplugin.patch
@@ -30,13 +27,12 @@ build() {
   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=${_prefix} \
+     --prefix=${TDEDIR} \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig \
      --enable-closure \
      --with-vorbis \
      --with-alsa \
@@ -49,6 +45,8 @@ build() {
      --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

arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdenetwork
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -26,12 +26,8 @@ md5sums=('349f197c9af4bf0d9b8773f26829415e'
 
 build() {
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  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"
 
   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
@@ -44,7 +40,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/kdenetwork \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_PREFIX=$TDEDIR \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DWITH_JINGLE=ON \
     -DWITH_SPEEX=ON \
@@ -60,6 +56,5 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-
+  make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir/" install
 }

arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD

@@ -25,18 +25,11 @@ 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')
 
-_prefix="/opt/trinity"
-
 build() {
-
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
+  
-   export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr:/usr/include
-   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
   msg "Creating out-of-source build directory: ${srcdir}/build"
   mkdir -p build
@@ -44,7 +37,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/kdepim \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DWITH_SASL=ON \
     -DWITH_NEWDISTRLISTS=ON \
@@ -71,8 +64,6 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-
   make DESTDIR="$pkgdir" install
-
   cd ${startdir}
 }

arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdesdk
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -19,38 +19,33 @@ md5sums=('130662f683be1a49d56a713c5ae87e46'
 
 build() {
    msg "Setting PATH, CMAKE and Trinity Environment variables"
-   export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/kde
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-   export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde:$LD_LIBRARY_PATH
-   export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-   _prefix="/opt/trinity"
 
    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=${_prefix} \
+      --prefix=${TDEDIR} \
       --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 \
       --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=${_prefix} \
+   #  -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
    #  -DCMAKE_VERBOSE_MAKEFILE=ON \
    #  -DWITH_DBSEARCHENGINE=ON \
    #  -DWITH_KCAL=ON \
@@ -76,6 +71,5 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/kdesdk
-
   make DESTDIR="$pkgdir" install
 }

arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdetoys
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,26 +15,24 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdetoys-3.5.13.tar.gz)
 md5sums=('823dd778c1e9e15972a509f4eee4434d')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$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=${_prefix} \
+     --prefix=${TDEDIR} \
-     --enable-closure \
+     --enable-closure 
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make

arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-kdeutils
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,27 +15,24 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeutils-3.5.13.tar.gz)
 md5sums=('e2cd6695606c5c91b3380dcc7f1a6a83')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+   [ "$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=${_prefix} \
+     --prefix=${TDEDIR} \
-     --enable-closure \
+     --enable-closure 
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
      #--with-xmms
      #--with-snmp \
 

arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD

@@ -2,8 +2,8 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 
 pkgname=trinity-kdevelop
-pkgver=12345
+pkgver=3513
-pkgrel=1.0
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -17,14 +17,9 @@ md5sums=('777bd77e4f2dc6a5b5b45a370dcf6da0'
          'ab23854b1658adc1da4621cb589ec1be')
 
 build() {
-
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  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
-
-  _prefix="/opt/trinity"
 
   msg "Patching..."
   # apply second part of Francois Andriot patch
@@ -37,7 +32,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/kdevelop \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DQT_VERSION=3 \
     -DWITH_QT3=ON \
@@ -51,6 +46,5 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-
   make DESTDIR="$pkgdir/" install
 }

arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-webdev
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -18,13 +18,8 @@ md5sums=('4f56a6c4b5916615ca3615f8e8f868c6'
 
 build() {
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  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"
-
   patch -N -d ${srcdir} -p0 < kdewebdev.patch
 
   cd $srcdir
@@ -34,7 +29,7 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/kdewebdev \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DBUILD_ALL=ON
   make
@@ -43,5 +38,5 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }

arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD

@@ -20,9 +20,10 @@ md5sums=('fba66a6c605a6d7be67a638cd29667b6'
          '5ce5bd3c1ed4d5004a864130a971f737'
          'c136e14af1923c2cf6dc5beb93da2ba4')
 
-_prefix=/usr
-
 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
@@ -31,10 +32,10 @@ build() {
 
   cd ${srcdir}/libcaldav-${pkgver}
   msg "Running ./autogen.sh for autoreconf"
-  ./autogen.sh --prefix=${_prefix}
+  ./autogen.sh --prefix=${TDEDIR}
 #    --includedir=/usr/include
 #   msg "Running configure"
-#   ./configure --prefix=${_prefix}
+#   ./configure --prefix=${TDEDIR}
 
   make || return 1
 }

arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD

@@ -18,10 +18,11 @@ source=("http://quickbuild.pearsoncomputing.net:58080/2056019/libcarddav_${pkgve
 md5sums=('42a0fe57ba4c639aad53024f6c8d5614'
          '63ef0b91ff27dfb7c48ca0f07866af79')
 
-_prefix=/usr
-
 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"
@@ -29,9 +30,9 @@ build() {
 
    cd ${srcdir}/libcarddav-${pkgver}
    msg "Running ./autogen.sh for autoreconf"
-   ./autogen.sh --prefix=${_prefix}
+   ./autogen.sh --prefix=${TDEDIR}
    #   msg "Running configure"
-   #   ./configure --prefix=${_prefix}
+   #   ./configure --prefix=${TDEDIR}
 
    make || return 1
 }

arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD

@@ -3,40 +3,38 @@
 
 pkgname=trinity-libkdcraw
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-extras')
 pkgdesc="Trinity DCRaw library"
 depends=('trinity-kdelibs')
-#openmpi
+         #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')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$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=${_prefix} \
+     --prefix=${TDEDIR} \
      --enable-closure \
-     --enable-openmp \
+     --enable-openmp
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make

arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-libkexiv2
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,26 +15,24 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkexiv2-3.5.13.tar.gz)
 md5sums=('74b160da8ea95f25048757b5fe692f85')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$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=${_prefix} \
+     --prefix=${TDEDIR} \
-     --enable-closure \
+     --enable-closure
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make

arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=trinity-libkipi
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,26 +15,24 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkipi-3.5.13.tar.gz)
 md5sums=('22cb0ba7507cac99140cd1c0180cbe99')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$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=${_prefix} \
+     --prefix=${TDEDIR} \
-     --enable-closure \
+     --enable-closure
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make

debian/lenny/applications/adept/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/adept/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/amarok/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/amarok/debian/rules

@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/basket/debian/rules

@@ -3,7 +3,7 @@
 
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/bibletime/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/bibletime/debian/rules

@@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian
 
 DEB_BUILDDIR = $(DEB_SRCDIR)
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/compizconfig-backend-kconfig/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/lenny/applications/desktop-effects-tde/debian/rules

@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/digikam/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/digikam/debian/digikam-trinity.install

@@ -1,5 +1,5 @@
 opt/trinity/bin/digi*
-/opt/trinity/include/kde
+/opt/trinity/include/tde
 opt/trinity/lib
 /opt/trinity/share/apps/digikam
 /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop

debian/lenny/applications/digikam/debian/rules

@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/filelight-l10n/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/filelight-l10n/debian/rules

@@ -7,7 +7,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -17,7 +17,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 #DEB_PATCHDIRS := debian/patches/common debian/patches
 #DEB_INSTALL_DOCS_ALL :=
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 post-patches:: debian/stamp-bootstrap
 

debian/lenny/applications/filelight/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/filelight/debian/rules

@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/gtk-qt-engine/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/gtk-qt-engine/debian/rules

@@ -15,7 +15,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -24,7 +24,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
-DEB_CMAKE_EXTRA_FLAGS := -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/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
+DEB_CMAKE_EXTRA_FLAGS := -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" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
 
 binary-install/gtk-qt-engine-trinity::
 	mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/

debian/lenny/applications/gwenview/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/gwenview/debian/rules

@@ -7,7 +7,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/k3b/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/k3b/debian/rules

@@ -11,7 +11,7 @@ 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 = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde"
+DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde"
 
 DEB_INSTALL_MANPAGES_k3b = debian/k3b.1
 

debian/lenny/applications/k3b/debian/trinity.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/k9copy/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/k9copy/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
 
 post-patches:: debian/stamp-bootstrap
 

debian/lenny/applications/kaffeine-mozilla/debian/rules

@@ -14,7 +14,7 @@ export DH_OPTIONS
 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/kde
+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

debian/lenny/applications/kaffeine/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install

@@ -13,7 +13,7 @@ debian/tmp/opt/trinity/share/doc/
 debian/tmp/opt/trinity/share/icons/
 debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop
 debian/tmp/opt/trinity/share/locale/
-debian/tmp/opt/trinity/include/kde/kaffeine/*h
+debian/tmp/opt/trinity/include/tde/kaffeine/*h
 debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop
 debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la
 debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so

debian/lenny/applications/kaffeine/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/katapult/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/katapult/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/kbarcode/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kbarcode/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/kbfx/debian/rules

@@ -7,21 +7,21 @@ URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME)
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
 #CMAKE_LIBRARY_PATH := /opt/trinity/lib 
-#CMAKE_INCLUDE_PATH := /opt/trinity/include/kde
+#CMAKE_INCLUDE_PATH := /opt/trinity/include/tde
 
 include debian/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/"
+DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/"
 
 get-orig-source:
 	@@dh_testdir

debian/lenny/applications/kbookreader/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kbookreader/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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 --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
 
 post-patches:: debian/stamp-bootstrap
 

debian/lenny/applications/kchmviewer/debian/debiandirs

@@ -1,6 +1,6 @@
 export kde_prefix=/usr
 export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
 export infodir=/usr/share/info
 export mandir=/usr/share/man
 export qtdir=/usr/share/qt3

debian/lenny/applications/kchmviewer/debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -27,7 +27,7 @@ CFLAGS = -Wall -g
 CONFIGURE_OPTIONS_KDE = \
 	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
-	--includedir=/opt/trinity/include/kde --mandir=/opt/trinity/share/man \
+	--includedir=/opt/trinity/include/tde --mandir=/opt/trinity/share/man \
 	--with-qt-dir=$(qtdir) \
 	--sysconfdir=$(sysconfdir) \
 	--infodir=/opt/trinity/share/info \

debian/lenny/applications/kcpuload/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kcpuload/debian/rules

@@ -5,7 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -79,7 +79,7 @@ configure-stamp:
 
 	# run configure with build tree $(objdir)
 	cd $(objdir) && \
-	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
 	touch configure-stamp
 

debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kdbusnotification/debian/rules

@@ -5,7 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -78,7 +78,7 @@ configure-stamp:
 
 	# run configure with build tree $(objdir)
 	cd $(objdir) && \
-	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
 	touch configure-stamp
 

debian/lenny/applications/kdiff3/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kdiff3/debian/rules

@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -37,7 +37,7 @@ config.status:
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	
 	make -f admin/Makefile.common cvs
-	CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+	CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 
 build: build-stamp

debian/lenny/applications/kdirstat/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kdirstat/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 LDFLAGS += -Wl,--as-needed
 

debian/lenny/applications/kdpkg/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/keep/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff

@@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/usr/include/kde/kde.pot
++kdepotpath=/usr/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/applications/keep/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_INSTALL_MANPAGES_keep := keep.1
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/lenny/applications/kerry/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kerry/debian/rules

@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 # include /usr/share/cdbs/1/class/kde.mk
 include debian/cdbs/debian-qt-kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/kile/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kile/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -15,7 +15,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 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/kde
+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/lenny/applications/kima/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/kio-apt/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kio-apt/debian/rules

@@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/lenny/applications/kio-umountwrapper/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kio-umountwrapper/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/lenny/applications/kmplayer/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kmplayer/debian/rules

@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3)
   CXX = g++ -fpermissive
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1
 

debian/lenny/applications/kmyfirewall/debian/debiandirs

@@ -1,6 +1,6 @@
 export kde_prefix=/usr
 export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
 export infodir=/usr/share/info
 export mandir=/usr/share/man
 export qtdir=/usr/share/qt3

debian/lenny/applications/kmyfirewall/debian/rules

@@ -6,7 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -56,7 +56,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+	CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 
 build: build-stamp
@@ -65,7 +65,7 @@ build-stamp:  config.status
 	dh_testdir
 
 	# Add here commands to compile the package.
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
 
 	touch build-stamp
 
@@ -94,7 +94,7 @@ install: build
 	dh_clean -k 
 
 	# Add here commands to install the package into debian/kmyfirewall.
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity
 
 	rm -f debian/kmyfirewall-trinity/opt/trinity/lib/*.so
 	chrpath -d debian/kmyfirewall-trinity/opt/trinity/bin/kmyfirewall debian/kmyfirewall-trinity/opt/trinity/lib/*.so.* debian/kmyfirewall-trinity/opt/trinity/lib/trinity/*.so

debian/lenny/applications/kmymoney/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kmymoney/debian/kmymoney2-trinity-dev.install

@@ -1,3 +1,3 @@
-opt/trinity/include/kde/kmymoney/*
+opt/trinity/include/tde/kmymoney/*
 opt/trinity/lib/lib*.la
 opt/trinity/lib/lib*.so

debian/lenny/applications/kmymoney/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde --disable-sqlite3
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3
 
 LDFLAGS += -Wl,--as-needed
 

debian/lenny/applications/knemo/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/knemo/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_INSTALL_DOCS_knemo = -XNEWS
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/lenny/applications/knetload/debian/rules

@@ -2,7 +2,7 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -74,7 +74,7 @@ configure-stamp:
 
 	# run configure with build tree $(objdir)
 	cd $(objdir) && \
-	../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+	../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 	touch configure-stamp
 

debian/lenny/applications/knetstats/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/knetstats/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/knetworkmanager8/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/knights/debian/debiandirs

@@ -1,6 +1,6 @@
 export kde_prefix=/usr
 export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
 export infodir=/usr/share/info
 export mandir=/usr/share/man
 export qtdir=/usr/share/qt3

debian/lenny/applications/knights/debian/rules

@@ -6,7 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -51,7 +51,7 @@ config.status: configure patch
 
 	if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	--disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/kde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+	--disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/tde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
 
 build: build-stamp

debian/lenny/applications/knowit/debian/rules

@@ -7,7 +7,7 @@
 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/kde
+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

debian/lenny/applications/knutclient/debian/rules

@@ -11,7 +11,7 @@
 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/kde
+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

debian/lenny/applications/koffice/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/koffice/debian/koffice-dev-trinity.install

@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde
+debian/tmp/opt/trinity/include/tde
 debian/tmp/opt/trinity/lib/libkarboncommon.la
 debian/tmp/opt/trinity/lib/libkarboncommon.so
 debian/tmp/opt/trinity/lib/libkchartcommon.la

debian/lenny/applications/koffice/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/konversation/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/konversation/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg
 DEB_INSTALL_DOCS_ALL = 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/lenny/applications/kopete-otr/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kopete-otr/debian/rules

@@ -3,14 +3,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/lenny/applications/kpicosim/debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -52,7 +52,7 @@ build-stamp:  config.status
 	dh_testdir
 
 	# Add here commands to compile the package.
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
 	#docbook-to-man debian/kpicosim.sgml > kpicosim.1
 
 	touch build-stamp

debian/lenny/applications/kpilot/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kpilot/debian/rules

@@ -3,14 +3,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/lenny/applications/kpowersave/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kpowersave/debian/rules

@@ -4,7 +4,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -12,7 +12,7 @@ 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_DOCS_ALL := AUTHORS NEWS
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/lenny/applications/kradio/debian/rules

@@ -9,7 +9,7 @@
 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/kde
+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

debian/lenny/applications/krename/debian/rules

@@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 ### Libtool and Automake updates
 post-patches:: debian/stamp-autothings-update

debian/lenny/applications/krusader/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/krusader/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/lenny/applications/ksplash-engine-moodin/debian/debiandirs

@@ -1,6 +1,6 @@
 export kde_prefix=/opt/trinity
 export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/kde
+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

debian/lenny/applications/ksplash-engine-moodin/debian/rules

@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -49,7 +49,7 @@ patch: patch-stamp
 config.status: configure patch
 	dh_testdir
 	
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 build: build-stamp
 

debian/lenny/applications/ksquirrel/debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/kstreamripper/debian/rules

@@ -3,10 +3,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1
 
 build/kstreamripper::	
-	env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE)
+	env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE)
 
 install/kstreamripper::
-	env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install
+	env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install
 	mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/
 	mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/
 	install -m 644 ./src/hi32-app-kstreamripper.png \

debian/lenny/applications/ksystemlog/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/ksystemlog/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/lenny/applications/ktechlab/debian/debiandirs

@@ -1,7 +1,7 @@
 export kde_confdir=/etc/trinity
 export kde_prefix=/opt/trinity
 export kde_bindir=/opt/trinity/bin
-export kde_includedir=/opt/trinity/include/kde
+export kde_includedir=/opt/trinity/include/tde
 export kde_libdir=/opt/trinity/lib
 export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_moduledir=/opt/trinity/lib/trinity

debian/lenny/applications/ktechlab/debian/rules

@@ -5,7 +5,7 @@
 
 -include debian/debiandirs
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -45,7 +45,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
+	PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
 
 build: build-stamp debian/ktechlab.xpm
 
@@ -55,7 +55,7 @@ build-stamp:  config.status
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
 	touch build-stamp
 
 clean:
@@ -85,8 +85,8 @@ install: build
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
 	install -D -m 644 debian/ktechlab.xpm debian/ktechlab-trinity/opt/trinity/share/pixmaps/ktechlab.xpm
 	chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/ktechlab
 	chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/microbe

debian/lenny/applications/ktorrent/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/ktorrent/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/debian-qt-kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ 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/kde
+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

debian/lenny/applications/kuickshow/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kuickshow/debian/rules

@@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/lenny/applications/kvirc/debian/rules

@@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/kvkbd/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/kvkbd/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 makebuilddir/kvkbd-trinity::
 	make -f Makefile.cvs

debian/lenny/applications/kvpnc/debian/rules

@@ -8,14 +8,14 @@ include /usr/share/cdbs/1/rules/utils.mk
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
 DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 makebuilddir/kvpnc-trinity::
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in

debian/lenny/applications/piklab/debian/rules

@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -48,7 +48,7 @@ endif
 	./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
-		--with-extra-includes=/opt/trinity/include/kde \
+		--with-extra-includes=/opt/trinity/include/tde \
 		--mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --enable-rpath
 	touch $@
 

debian/lenny/applications/potracegui/debian/rules

@@ -11,7 +11,7 @@
 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/kde
+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

debian/lenny/applications/smb4k/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/smb4k/debian/rules

@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/soundkonverter/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/soundkonverter/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/tde-guidance/debian/rules

@@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_UPDATE_RCD_PARAMS := multiuser
 DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/displayconfig-trinity.1  debian/mountconfig-trinity.1  debian/serviceconfig-trinity.1  debian/userconfig-trinity.1
 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 LDFLAGS_APPEND := -L/opt/trinity/lib
 
 install/tde-guidance-trinity::

debian/lenny/applications/tde-style-lipstik/debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -37,7 +37,7 @@ config.status: patch configure
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
                 --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
                 --disable-debug --enable-final \
-		--with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+		--with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 #               --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/ 
 
 build: build-stamp

debian/lenny/applications/tde-systemsettings/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/tde-systemsettings/debian/rules

@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/tdesudo/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/tdesudo/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1
 

debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/tdmtheme/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/lenny/applications/tellico/debian/rules

@@ -5,7 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/twin-style-crystal/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/twin-style-crystal/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/applications/yakuake/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/applications/yakuake/debian/rules

@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/dependencies/arts/debian/rules

@@ -14,7 +14,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
-DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -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/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON"
+DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -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" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.

debian/lenny/dependencies/libcaldav/debian/README.Debian

@@ -0,0 +1,45 @@
+		Imlib Version 11
+		----------------
+
+Imlib11 is linked with libpng12, which began life as libpng3.  This is
+in accordance with the practice of Redhat.  The GDK version of imlib,
+being part of GNOME 1, has remained linked with libpng2.
+
+No library that links with this version of Imlib may also link with
+libpng2.
+
+No application that links with this version of Imlib may link with
+libpng2, neither directly nor through a third library.
+
+If you accidentally link an application with imlib and libpng2, the
+application may behave in unpredictible ways, possibly crashing,
+possibly emitting warnings similar to the following:
+
+  libpng warning: Application was compiled with png.h from libpng-1.2.1
+  libpng warning: Application  is running with png.c from libpng-1.0.12
+  libpng error: Incompatible libpng version in application and library
+
+
+
+		Imlib Version 1
+		---------------
+
+Imlib1 and gdk-imlib1 are compiled against libpng2.  If you need to
+build with libpng2, install the package imlib1-dev or gdk-imlib1-dev
+as appropriate.
+
+
+		The Palette File
+		----------------
+
+The system Imlib/Gdk-Imlib palette file was moved from the directory
+`/etc/im' to `/etc/imlib'.  This move may cause problems for users who
+have a `.imrc' file in their home directory since that file may
+contain a reference to the old location of the palette file.  To
+correct this problem, the "PaletteFile" entry should look like:
+
+        PaletteFile /etc/imlib/im_palette.pal
+
+I believe this changed happened in late 1999.
+
+ -- Steve M. Robbins <smr@debian.org>, Sun Oct 19 15:11:42 2003

debian/lenny/dependencies/libcaldav/debian/README.fallback

@@ -0,0 +1,23 @@
+		Imlib Image Conversion
+		----------------------
+
+The imlib and gdk-imlib libraries have a number of built-in image
+conversion routines, and are capable of loading or saving in *at
+least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and
+PPM.
+
+Prior to version 1.9.13, imlib and gdk-imlib could use an external
+program, such as Imagemagick's "convert", to load or save images
+in formats not handled internally to Imlib.  
+
+
+
+		"All fallbacks failed."
+		-----------------------
+
+This message indicates that the file you wished to load is not handled
+by Imlib.
+
+The remedy is to convert the image file by hand using, for example,
+Imagemagick's "convert" command: "convert foo.rgb foo.png".  Then
+you'll have to fix up the application to use the new filename instead.

debian/lenny/dependencies/libcaldav/debian/changelog

@@ -0,0 +1,29 @@
+libcaldav (0.6.5-2debian2) maverick; urgency=low
+
+  * Fixed RECURRENCE-ID modification with Zimbra CalDAV resources
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 28 Aug 2010 16:34:00 -0600
+
+libcaldav (0.6.4-0debian0) lenny; urgency=low
+
+  * Added VTODO support
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 27 Aug 2010 18:53:00 -0600
+
+libcaldav (0.6.3-0debian1) lenny; urgency=low
+
+  * Multiple VEVENT blocks in a single CardDAV response are now returned correctly
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 26 Aug 2010 15:40:00 -0600
+
+libcaldav (0.6.2-0debian0) lenny; urgency=low
+
+  * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 18 Jul 2010 15:29:00 -0600
+
+libcaldav (0.6.1-1debian0) lenny; urgency=low
+
+  * Initial Lenny build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 31 May 2010 01:55:00 -0600

debian/lenny/dependencies/libcaldav/debian/compat

@@ -0,0 +1 @@
+5

debian/lenny/dependencies/libcaldav/debian/control

@@ -0,0 +1,23 @@
+Source: libcaldav
+Build-Depends: debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Section: graphics
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Standards-Version: 3.8.3
+
+Package: libcaldav
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: 
+ libcaldav provides a C interface for caldav PIM clients
+
+Package: libcaldav-dev
+Architecture: any
+Section: libdevel
+Depends: libcaldav (= ${binary:Version})
+Description: 
+ libcaldav provides a C interface for caldav PIM clients
+ .
+ This is the development package containing header files and link
+ libraries for libcaldav.

debian/lenny/dependencies/libcaldav/debian/copyright

@@ -0,0 +1,13 @@
+This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+
+It was downloaded from http://sourceforge.net/projects/libcaldav/
+
+Copyright:
+
+Copyright 2008 by Michael Rasmussen (mir@datanom.net)
+
+License:
+
+All libraries in this package are released under the GPL
+(/usr/share/common-licenses/GPL-3).  The programs and examples are
+under the GPL (/usr/share/common-licenses/GPL).

debian/lenny/dependencies/libcaldav/debian/rules

@@ -0,0 +1,105 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export CFLAGS = -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O3
+endif
+
+# Suppress accidental execution of the auto-* tools, c.f.
+# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html
+no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
+	AUTOCONF="`pwd`/missing autoconf" \
+	AUTOMAKE="`pwd`/missing automake" \
+	AUTOHEADER="`pwd`/missing autoheader"
+
+make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
+
+build: $(QUILT_STAMPFN) build-stamp
+build-stamp:
+	dh_testdir
+	./autogen.sh
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man
+	$(MAKE) $(make_flags)
+
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+	dh_clean
+
+install: DH_OPTIONS=
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install
+
+	dh_movefiles
+
+	# Library package
+	dh_install -plibcaldav --autodest debian/tmp/usr/lib/libcaldav.so*
+
+	# Developer package
+	mv debian/tmp/usr/include/libcaldav* debian/tmp/usr/include/libcaldav
+	dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/libcaldav.la
+	dh_install -plibcaldav-dev --autodest debian/tmp/usr/include/libcaldav/*
+	dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/pkgconfig/*
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installdocs -A debian/README.Debian
+	dh_installexamples
+	dh_installmenu
+	dh_installcron
+	dh_installinfo
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_strip
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independent packages using the common target.
+binary-indep: build install
+	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependent packages using the common target.
+binary-arch: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+	make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

debian/lenny/dependencies/libcaldav/debian/watch

@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz

debian/lenny/dependencies/libcarddav/debian/README.Debian

@@ -0,0 +1,45 @@
+		Imlib Version 11
+		----------------
+
+Imlib11 is linked with libpng12, which began life as libpng3.  This is
+in accordance with the practice of Redhat.  The GDK version of imlib,
+being part of GNOME 1, has remained linked with libpng2.
+
+No library that links with this version of Imlib may also link with
+libpng2.
+
+No application that links with this version of Imlib may link with
+libpng2, neither directly nor through a third library.
+
+If you accidentally link an application with imlib and libpng2, the
+application may behave in unpredictible ways, possibly crashing,
+possibly emitting warnings similar to the following:
+
+  libpng warning: Application was compiled with png.h from libpng-1.2.1
+  libpng warning: Application  is running with png.c from libpng-1.0.12
+  libpng error: Incompatible libpng version in application and library
+
+
+
+		Imlib Version 1
+		---------------
+
+Imlib1 and gdk-imlib1 are compiled against libpng2.  If you need to
+build with libpng2, install the package imlib1-dev or gdk-imlib1-dev
+as appropriate.
+
+
+		The Palette File
+		----------------
+
+The system Imlib/Gdk-Imlib palette file was moved from the directory
+`/etc/im' to `/etc/imlib'.  This move may cause problems for users who
+have a `.imrc' file in their home directory since that file may
+contain a reference to the old location of the palette file.  To
+correct this problem, the "PaletteFile" entry should look like:
+
+        PaletteFile /etc/imlib/im_palette.pal
+
+I believe this changed happened in late 1999.
+
+ -- Steve M. Robbins <smr@debian.org>, Sun Oct 19 15:11:42 2003

debian/lenny/dependencies/libcarddav/debian/README.fallback

@@ -0,0 +1,23 @@
+		Imlib Image Conversion
+		----------------------
+
+The imlib and gdk-imlib libraries have a number of built-in image
+conversion routines, and are capable of loading or saving in *at
+least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and
+PPM.
+
+Prior to version 1.9.13, imlib and gdk-imlib could use an external
+program, such as Imagemagick's "convert", to load or save images
+in formats not handled internally to Imlib.  
+
+
+
+		"All fallbacks failed."
+		-----------------------
+
+This message indicates that the file you wished to load is not handled
+by Imlib.
+
+The remedy is to convert the image file by hand using, for example,
+Imagemagick's "convert" command: "convert foo.rgb foo.png".  Then
+you'll have to fix up the application to use the new filename instead.

debian/lenny/dependencies/libcarddav/debian/changelog

@@ -0,0 +1,17 @@
+libcarddav (0.6.2-2debian2) maverick; urgency=low
+
+  * Modified contact list grabber to first execute a WebDAV directory list, then use the results to get only the contact files in that directory.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 21 Jul 2010 02:55:00 -0600
+
+libcarddav (0.6.2-0debian1) lenny; urgency=low
+
+  * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 18 Jul 2010 15:29:00 -0600
+
+libcarddav (0.6.2-0debian0) lenny; urgency=low
+
+  * Initial Lenny build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 31 May 2010 01:55:00 -0600

debian/lenny/dependencies/libcarddav/debian/compat

@@ -0,0 +1 @@
+5

debian/lenny/dependencies/libcarddav/debian/control

@@ -0,0 +1,23 @@
+Source: libcarddav
+Build-Depends: debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev
+Section: graphics
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Standards-Version: 3.8.4
+
+Package: libcarddav
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: 
+ libcarddav provides a C interface for carddav PIM clients
+
+Package: libcarddav-dev
+Architecture: any
+Section: libdevel
+Depends: libcarddav (= ${binary:Version})
+Description: 
+ libcarddav provides a C interface for carddav PIM clients
+ .
+ This is the development package containing header files and link
+ libraries for libcarddav.

debian/lenny/dependencies/libcarddav/debian/copyright

@@ -0,0 +1,14 @@
+This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+
+It was created from unreleased sources derived from libcaldav
+
+Copyright:
+
+Copyright 2010 by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+Copyright 2008 by Michael Rasmussen (mir@datanom.net)
+
+License:
+
+All libraries in this package are released under the GPL
+(/usr/share/common-licenses/GPL-3).  The programs and examples are
+under the GPL (/usr/share/common-licenses/GPL).

debian/lenny/dependencies/libcarddav/debian/rules

@@ -0,0 +1,105 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export CFLAGS = -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O3
+endif
+
+# Suppress accidental execution of the auto-* tools, c.f.
+# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html
+no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
+	AUTOCONF="`pwd`/missing autoconf" \
+	AUTOMAKE="`pwd`/missing automake" \
+	AUTOHEADER="`pwd`/missing autoheader"
+
+make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
+
+build: $(QUILT_STAMPFN) build-stamp
+build-stamp:
+	dh_testdir
+	./autogen.sh
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man
+	$(MAKE) $(make_flags)
+
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+	dh_clean
+
+install: DH_OPTIONS=
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install
+
+	dh_movefiles
+
+	# Library package
+	dh_install -plibcarddav --autodest debian/tmp/usr/lib/libcarddav.so*
+
+	# Developer package
+	mv debian/tmp/usr/include/libcarddav* debian/tmp/usr/include/libcarddav
+	dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/libcarddav.la
+	dh_install -plibcarddav-dev --autodest debian/tmp/usr/include/libcarddav/*
+	dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/pkgconfig/*
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installdocs -A debian/README.Debian
+	dh_installexamples
+	dh_installmenu
+	dh_installcron
+	dh_installinfo
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_strip
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independent packages using the common target.
+binary-indep: build install
+	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependent packages using the common target.
+binary-arch: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+	make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

debian/lenny/dependencies/libcarddav/debian/watch

@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz

debian/lenny/libraries/kipi-plugins/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/libraries/kipi-plugins/debian/rules

@@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 clean ::
 	rm -f po/*/*.gmo

debian/lenny/libraries/libkdcraw/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/libraries/libkdcraw/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/libraries/libkexiv2/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/libraries/libkexiv2/debian/rules

@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/libraries/libkipi/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/libraries/libkipi/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/libraries/libksquirrel/debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/libraries/mlt++/debian/rules

@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/libraries/mlt/debian/rules

@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -47,10 +47,10 @@ configure-stamp:
 
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 
-	CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --enable-gpl \
+	CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \
 	--luma-compress --disable-mmx $(CONFIGURE_OPTS) \
 	--avformat-shared=/usr --avformat-swscale \
-	--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+	--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 	touch configure-stamp
 
@@ -58,7 +58,7 @@ build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
-	env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -j $(NCPUS)
+	env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -j $(NCPUS)
 
 	touch build-stamp
 
@@ -81,7 +81,7 @@ install: build
 	dh_clean -k 
 	dh_installdirs opt/trinity/lib/mlt0.2.5/modules opt/trinity/share/mlt0.2.5
 
-	env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 #	mkdir debian/tmp/opt/trinity
 #	mv debian/tmp/opt/trinity/lib debian/tmp/opt/trinity/

debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install

@@ -1,4 +1,4 @@
-opt/trinity/include/kde/pythonize.h
+opt/trinity/include/tde/pythonize.h
 opt/trinity/lib/libpythonize.a
 opt/trinity/lib/libpythonize.la
 opt/trinity/lib/libpythonize.so

debian/lenny/libraries/pytdeextensions/debian/rules

@@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -16,7 +16,7 @@ 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_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 install/pytdeextensions-trinity::
 	# We have no idea if the built product is site-packages or dist-packages
@@ -45,8 +45,8 @@ install/libpythonize0-trinity::
 	# fix binary-or-shlib-defines-rpath
 	chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
 	# fix include directory location
-	mkdir -p debian/tmp/opt/trinity/include/kde
+	mkdir -p debian/tmp/opt/trinity/include/tde
-	mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/kde
+	mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde
 
 clean::
 	rm -rf build

debian/lenny/tde-i18n/debian/debiandirs

@@ -1,6 +1,6 @@
 export kde_prefix=/opt/trinity
 export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/kde
+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

debian/lenny/tde-i18n/debian/rules

@@ -24,7 +24,7 @@ I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS))
 
 -include debian/debiandirs
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdeaccessibility/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdeaccessibility/debian/ksayit-trinity.install

@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ksayit
-debian/tmp/opt/trinity/include/kde/ksayit_fxplugin.h
+debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h
 debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la
 debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so
 debian/tmp/opt/trinity/lib/libKTTSD_Lib.la

debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdeaccessibility/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdeaddons/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdeaddons/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdeadmin/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdeadmin/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdeartwork/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdeartwork/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdebase/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4

debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff

@@ -1,12 +1,12 @@
 --- starttde
 +++ starttde
-@@ -184,17 +184,17 @@
+@@ -228,17 +228,17 @@
    . $tdehome/share/config/startupconfig
  fi
  
 -# Make sure a default wallpaper is set.
 -if [ ! -e $tdehome/share/config/kdesktoprc ]; then
-- # With Trinity KDE this file should exist, but test first.
+- # With Trinity this file should exist, but test first.
 -  if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
 -cat >$tdehome/share/config/kdesktoprc <<EOF
 -[Desktop0]
@@ -17,7 +17,7 @@
 -fi
 +## Make sure a default wallpaper is set.
 +#if [ ! -e $tdehome/share/config/kdesktoprc ]; then
-+# # With Trinity KDE this file should exist, but test first.
++# # With Trinity this file should exist, but test first.
 +#  if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
 +#cat >$tdehome/share/config/kdesktoprc <<EOF
 +#[Desktop0]

debian/lenny/tdebase/debian/rules

@@ -21,7 +21,7 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -
 
 DEB_CMAKE_EXTRA_FLAGS := -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" -DWITH_GCC_VISIBILITY="ON" \
 -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON"
+-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_UPOWER="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.

debian/lenny/tdebase/debian/tdebase-trinity-bin.install

@@ -1,4 +1,5 @@
 debian/tmp/opt/trinity/bin/krootbacking
+debian/tmp/opt/trinity/bin/tdeinit_phase1
 debian/tmp/opt/trinity/bin/tdmtsak
 debian/tmp/opt/trinity/bin/tsak
 debian/tmp/opt/trinity/bin/kdebugdialog

debian/lenny/tdebase/debian/twin-trinity.install

@@ -1,6 +1,7 @@
 debian/tmp/opt/trinity/bin/kompmgr
 debian/tmp/opt/trinity/bin/twin
 debian/tmp/opt/trinity/bin/twin_killer_helper
+debian/tmp/opt/trinity/bin/twin_resumer_helper
 debian/tmp/opt/trinity/bin/twin_rules_dialog
 debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules
 debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings

debian/lenny/tdebindings/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install

@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde/kjsembed/*
+debian/tmp/opt/trinity/include/tde/kjsembed/*
 debian/tmp/opt/trinity/lib/libkjsembed.so
 debian/tmp/opt/trinity/lib/libkjsembed.la
 

debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install

@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde/smoke.h
+debian/tmp/opt/trinity/include/tde/smoke.h
 debian/tmp/opt/trinity/lib/libsmokeqt.so
 debian/tmp/opt/trinity/lib/libsmokeqt.la

debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdebindings/debian/rules

@@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR)
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdeedu/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdeedu/debian/kstars-trinity.install

@@ -1,7 +1,7 @@
 etc/trinity/kstarsrc
 opt/trinity/bin/kstars
-/opt/trinity/include/kde/kstarsinterface.h
+/opt/trinity/include/tde/kstarsinterface.h
-/opt/trinity/include/kde/simclockinterface.h
+/opt/trinity/include/tde/simclockinterface.h
 /opt/trinity/share/applications/kde/kstars.desktop
 /opt/trinity/share/config.kcfg/kstars.kcfg
 /opt/trinity/share/doc/kde/HTML/en/kstars/common

debian/lenny/tdeedu/debian/libkiten-dev-trinity.install

@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/libkiten
+/opt/trinity/include/tde/libkiten
 opt/trinity/lib/libkiten.la
 opt/trinity/lib/libkiten.so

debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install

@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/libtdeedu
+/opt/trinity/include/tde/libtdeedu
 opt/trinity/lib/libextdate.la
 opt/trinity/lib/libextdate.so
 opt/trinity/lib/libtdeeducore.la

debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdeedu/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
 
 # Ensure that kig's python scripting built successfully.
 common-build-arch::

debian/lenny/tdegames/debian/atlantik-trinity-dev.install

@@ -1,5 +1,5 @@
-/opt/trinity/include/kde/atlantik
+/opt/trinity/include/tde/atlantik
-/opt/trinity/include/kde/atlantic
+/opt/trinity/include/tde/atlantic
 /opt/trinity/lib/libatlantic.so
 /opt/trinity/lib/libatlantikclient.so
 /opt/trinity/lib/libatlantikui.so

debian/lenny/tdegames/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdegames/debian/kolf-trinity-dev.install

@@ -1,2 +1,2 @@
-/opt/trinity/include/kde/kolf
+/opt/trinity/include/tde/kolf
 /opt/trinity/lib/libkolf.so

debian/lenny/tdegames/debian/libtdegames-trinity-dev.install

@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/*.h
+/opt/trinity/include/tde/*.h
-/opt/trinity/include/kde/kgame
+/opt/trinity/include/tde/kgame
 /opt/trinity/lib/libtdegames.so
 /opt/trinity/lib/libtdegames.la

debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdegames/debian/rules

@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk
 
 export kde_bindir = /opt/trinity/games
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdegraphics/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install

@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h
+debian/tmp/opt/trinity/include/tde/poppler-link-qt3.h
-debian/tmp/opt/trinity/include/kde/poppler-page-transition.h
+debian/tmp/opt/trinity/include/tde/poppler-page-transition.h
-debian/tmp/opt/trinity/include/kde/poppler-qt.h
+debian/tmp/opt/trinity/include/tde/poppler-qt.h

debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install

@@ -1,184 +1,184 @@
-debian/tmp/opt/trinity/include/kde/dom/SVGAElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphDefElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphDefElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAngle.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAngle.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateColorElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateColorElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateMotionElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateMotionElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateTransformElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateTransformElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedAngle.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedAngle.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedBoolean.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedBoolean.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedEnumeration.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedEnumeration.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedInteger.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedInteger.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLength.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLength.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLengthList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLengthList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumber.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumber.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumberList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumberList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPathData.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPathData.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPoints.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPoints.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPreserveAspectRatio.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPreserveAspectRatio.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedRect.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedRect.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedString.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedString.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedTransformList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedTransformList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimationElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimationElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGCSSRule.h
+debian/tmp/opt/trinity/include/tde/dom/SVGCSSRule.h
-debian/tmp/opt/trinity/include/kde/dom/SVGCircleElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGCircleElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGClipPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGClipPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGColor.h
+debian/tmp/opt/trinity/include/tde/dom/SVGColor.h
-debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileRule.h
+debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileRule.h
-debian/tmp/opt/trinity/include/kde/dom/SVGComponentTransferFunctionElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGComponentTransferFunctionElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGCursorElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGCursorElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDefinitionSrcElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDefinitionSrcElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDefsElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDefsElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDescElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDescElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDocument.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDocument.h
-debian/tmp/opt/trinity/include/kde/dom/SVGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGElementInstance.h
+debian/tmp/opt/trinity/include/tde/dom/SVGElementInstance.h
-debian/tmp/opt/trinity/include/kde/dom/SVGElementInstanceList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGElementInstanceList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGEllipseElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGEllipseElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGEvent.h
+debian/tmp/opt/trinity/include/tde/dom/SVGEvent.h
-debian/tmp/opt/trinity/include/kde/dom/SVGException.h
+debian/tmp/opt/trinity/include/tde/dom/SVGException.h
-debian/tmp/opt/trinity/include/kde/dom/SVGExternalResourcesRequired.h
+debian/tmp/opt/trinity/include/tde/dom/SVGExternalResourcesRequired.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEBlendElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEBlendElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEColorMatrixElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEColorMatrixElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEComponentTransferElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEComponentTransferElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFECompositeElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFECompositeElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEConvolveMatrixElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEConvolveMatrixElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEDiffuseLightingElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEDiffuseLightingElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEDisplacementMapElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEDisplacementMapElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEDistantLightElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEDistantLightElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFloodElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFloodElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncAElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncAElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncBElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncBElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncRElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncRElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEGaussianBlurElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEGaussianBlurElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEImageElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEImageElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeNodeElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeNodeElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEMorphologyElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEMorphologyElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEOffsetElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEOffsetElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEPointLightElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEPointLightElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFESpecularLightingElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFESpecularLightingElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFESpotLightElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFESpotLightElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFETileElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFETileElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFETurbulenceElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFETurbulenceElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFilterElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFilterElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFitToViewBox.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFitToViewBox.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceFormatElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceFormatElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceNameElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceNameElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceSrcElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceSrcElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceUriElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceUriElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGForeignObjectElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGForeignObjectElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGlyphElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGlyphElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGlyphRefElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGlyphRefElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGradientElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGradientElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGHKernElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGHKernElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGICCColor.h
+debian/tmp/opt/trinity/include/tde/dom/SVGICCColor.h
-debian/tmp/opt/trinity/include/kde/dom/SVGImageElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGImageElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLangSpace.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLangSpace.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLength.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLength.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLengthList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLengthList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLineElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLineElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLinearGradientElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLinearGradientElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLocatable.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLocatable.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMarkerElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMarkerElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMaskElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMaskElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMatrix.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMatrix.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMetadataElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMetadataElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMissingGlyphElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMissingGlyphElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGNumber.h
+debian/tmp/opt/trinity/include/tde/dom/SVGNumber.h
-debian/tmp/opt/trinity/include/kde/dom/SVGNumberList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGNumberList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPaint.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPaint.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSeg.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSeg.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegArc.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegArc.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegClosePath.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegClosePath.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubic.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubic.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadratic.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadratic.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLineto.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLineto.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoHorizontal.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoHorizontal.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoVertical.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoVertical.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegMoveto.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegMoveto.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPatternElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPatternElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPoint.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPoint.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPointList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPointList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPolygonElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPolygonElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPolylineElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPolylineElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPreserveAspectRatio.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPreserveAspectRatio.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRadialGradientElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRadialGradientElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRect.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRect.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRectElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRectElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRenderingIntent.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRenderingIntent.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSVGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSVGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGScriptElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGScriptElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSetElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSetElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStopElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStopElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStringList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStringList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStylable.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStylable.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStyleElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStyleElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSwitchElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSwitchElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSymbolElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSymbolElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTRefElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTRefElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTSpanElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTSpanElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTests.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTests.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextContentElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextContentElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextPositioningElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextPositioningElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTitleElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTitleElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTransform.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTransform.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTransformList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTransformList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTransformable.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTransformable.h
-debian/tmp/opt/trinity/include/kde/dom/SVGURIReference.h
+debian/tmp/opt/trinity/include/tde/dom/SVGURIReference.h
-debian/tmp/opt/trinity/include/kde/dom/SVGUnitTypes.h
+debian/tmp/opt/trinity/include/tde/dom/SVGUnitTypes.h
-debian/tmp/opt/trinity/include/kde/dom/SVGUseElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGUseElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGVKernElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGVKernElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGViewElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGViewElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGViewSpec.h
+debian/tmp/opt/trinity/include/tde/dom/SVGViewSpec.h
-debian/tmp/opt/trinity/include/kde/dom/SVGWindow.h
+debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h
-debian/tmp/opt/trinity/include/kde/dom/SVGZoomAndPan.h
+debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h
-debian/tmp/opt/trinity/include/kde/dom/SVGZoomEvent.h
+debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h
-debian/tmp/opt/trinity/include/kde/kfaximage.h
+debian/tmp/opt/trinity/include/tde/kfaximage.h
-debian/tmp/opt/trinity/include/kde/kmultipageInterface.h
+debian/tmp/opt/trinity/include/tde/kmultipageInterface.h
-debian/tmp/opt/trinity/include/kde/ksvg/CanvasFactory.h
+debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h
-debian/tmp/opt/trinity/include/kde/ksvg/CanvasItem.h
+debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h
-debian/tmp/opt/trinity/include/kde/ksvg/CanvasItems.h
+debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h
-debian/tmp/opt/trinity/include/kde/ksvg/DocumentFactory.h
+debian/tmp/opt/trinity/include/tde/ksvg/DocumentFactory.h
-debian/tmp/opt/trinity/include/kde/ksvg/KSVGCanvas.h
+debian/tmp/opt/trinity/include/tde/ksvg/KSVGCanvas.h
-debian/tmp/opt/trinity/include/kde/ksvg/ksvg_plugin.h
+debian/tmp/opt/trinity/include/tde/ksvg/ksvg_plugin.h
-debian/tmp/opt/trinity/include/kde/kviewshell/anchor.h
+debian/tmp/opt/trinity/include/tde/kviewshell/anchor.h
-debian/tmp/opt/trinity/include/kde/kviewshell/bookmark.h
+debian/tmp/opt/trinity/include/tde/kviewshell/bookmark.h
-debian/tmp/opt/trinity/include/kde/kviewshell/pageView.h
+debian/tmp/opt/trinity/include/tde/kviewshell/pageView.h
-debian/tmp/opt/trinity/include/kde/kviewshell/documentPageCache.h
+debian/tmp/opt/trinity/include/tde/kviewshell/documentPageCache.h
-debian/tmp/opt/trinity/include/kde/kviewshell/documentRenderer.h
+debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h
-debian/tmp/opt/trinity/include/kde/kviewshell/documentWidget.h
+debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h
-debian/tmp/opt/trinity/include/kde/kviewshell/history.h
+debian/tmp/opt/trinity/include/tde/kviewshell/history.h
-debian/tmp/opt/trinity/include/kde/kviewshell/hyperlink.h
+debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h
-debian/tmp/opt/trinity/include/kde/kviewshell/kmultipage.h
+debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h
-debian/tmp/opt/trinity/include/kde/kviewshell/length.h
+debian/tmp/opt/trinity/include/tde/kviewshell/length.h
-debian/tmp/opt/trinity/include/kde/kviewshell/pageNumber.h
+debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h
-debian/tmp/opt/trinity/include/kde/kviewshell/pageSize.h
+debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h
-debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPage.h
+debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPage.h
-debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePixmap.h
+debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePixmap.h
-debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePrinter.h
+debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePrinter.h
-debian/tmp/opt/trinity/include/kde/kviewshell/selection.h
+debian/tmp/opt/trinity/include/tde/kviewshell/selection.h
-debian/tmp/opt/trinity/include/kde/kviewshell/simplePageSize.h
+debian/tmp/opt/trinity/include/tde/kviewshell/simplePageSize.h
-debian/tmp/opt/trinity/include/kde/kviewshell/textBox.h
+debian/tmp/opt/trinity/include/tde/kviewshell/textBox.h
-debian/tmp/opt/trinity/include/kde/kviewshell/zoom.h
+debian/tmp/opt/trinity/include/tde/kviewshell/zoom.h
-debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h
+debian/tmp/opt/trinity/include/tde/kviewshell/zoomlimits.h
-debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h
+debian/tmp/opt/trinity/include/tde/libtext2path-0.1/BezierPath.h
-debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h
+debian/tmp/opt/trinity/include/tde/libtext2path-0.1/Glyph.h
-debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h
+debian/tmp/opt/trinity/include/tde/libtext2path-0.1/GlyphTracer.h
 debian/tmp/opt/trinity/lib/libtdeinit_kview.la
 debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.la

debian/lenny/tdelibs/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml

@@ -93,8 +93,8 @@ manpage.1: manpage.sgml
 
     <para><command>&dhpackage;</command> will create the first two
     resources in directories under <filename>/tmp</filename> (or
-    <envar>KDETMP</envar> if defined in the environment) and will use
+    <envar>TDETMP</envar> if defined in the environment) and will use
-    <filename>/var/tmp</filename> (or <envar>KDEVARTMP</envar> if
+    <filename>/var/tmp</filename> (or <envar>TDEVARTMP</envar> if
     defined in the environment) for the <emphasis>cache</emphasis>
     resource (in order to survive system reboots). The temporary
     directories created for resources are usually of the form

debian/lenny/tdelibs/debian/rules

@@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes
 version=Debian Package $(DEB_VERSION)
 DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
 
-DEB_CMAKE_EXTRA_FLAGS := -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/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
+DEB_CMAKE_EXTRA_FLAGS := -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" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
 -DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to

debian/lenny/tdemultimedia/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdemultimedia/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -14,9 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--with-alsa --with-arts-alsa \
-	--with-extra-includes=/usr/include/speex:/opt/trinity/include/kde/arts \
+	--with-extra-includes=/usr/include/speex:/opt/trinity/include/tde/arts \
 	--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-	# The include/kde/arts one should be temporary. See
+	# The include/tde/arts one should be temporary. See
 	# "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
 
 DOC_HTML_PRUNE := kcontrol-trinity

debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install

@@ -1,137 +1,137 @@
-debian/tmp/opt/trinity/include/kde/arts/artsbuilder.h
+debian/tmp/opt/trinity/include/tde/arts/artsbuilder.h
-debian/tmp/opt/trinity/include/kde/arts/artsbuilder.idl
+debian/tmp/opt/trinity/include/tde/arts/artsbuilder.idl
-debian/tmp/opt/trinity/include/kde/arts/artsgui.h
+debian/tmp/opt/trinity/include/tde/arts/artsgui.h
-debian/tmp/opt/trinity/include/kde/arts/artsgui.idl
+debian/tmp/opt/trinity/include/tde/arts/artsgui.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmidi.h
+debian/tmp/opt/trinity/include/tde/arts/artsmidi.h
-debian/tmp/opt/trinity/include/kde/arts/artsmidi.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmidi.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodules.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodules.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodules.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodules.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.h
+debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.h
-debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.idl
-debian/tmp/opt/trinity/include/kde/arts/kartswidget.h
+debian/tmp/opt/trinity/include/tde/arts/kartswidget.h
-debian/tmp/opt/trinity/include/kde/arts/kframe_impl.h
+debian/tmp/opt/trinity/include/tde/arts/kframe_impl.h
-debian/tmp/opt/trinity/include/kde/arts/klayoutbox_impl.h
+debian/tmp/opt/trinity/include/tde/arts/klayoutbox_impl.h
-debian/tmp/opt/trinity/include/kde/arts/kwidget_impl.h
+debian/tmp/opt/trinity/include/tde/arts/kwidget_impl.h
-debian/tmp/opt/trinity/include/kde/arts/kwidgetrepo.h
+debian/tmp/opt/trinity/include/tde/arts/kwidgetrepo.h
-debian/tmp/opt/trinity/include/kde/audiocdencoder.h
+debian/tmp/opt/trinity/include/tde/audiocdencoder.h
-debian/tmp/opt/trinity/include/kde/cmodule.h
+debian/tmp/opt/trinity/include/tde/cmodule.h
-debian/tmp/opt/trinity/include/kde/effectview.h
+debian/tmp/opt/trinity/include/tde/effectview.h
-debian/tmp/opt/trinity/include/kde/equalizerview.h
+debian/tmp/opt/trinity/include/tde/equalizerview.h
-debian/tmp/opt/trinity/include/kde/ksaver.h
+debian/tmp/opt/trinity/include/tde/ksaver.h
-debian/tmp/opt/trinity/include/kde/libkcddb/cache.h
+debian/tmp/opt/trinity/include/tde/libkcddb/cache.h
-debian/tmp/opt/trinity/include/kde/libkcddb/cddb.h
+debian/tmp/opt/trinity/include/tde/libkcddb/cddb.h
-debian/tmp/opt/trinity/include/kde/libkcddb/cdinfo.h
+debian/tmp/opt/trinity/include/tde/libkcddb/cdinfo.h
-debian/tmp/opt/trinity/include/kde/libkcddb/client.h
+debian/tmp/opt/trinity/include/tde/libkcddb/client.h
-debian/tmp/opt/trinity/include/kde/libkcddb/config.h
+debian/tmp/opt/trinity/include/tde/libkcddb/config.h
-debian/tmp/opt/trinity/include/kde/libkcddb/configbase.h
+debian/tmp/opt/trinity/include/tde/libkcddb/configbase.h
-debian/tmp/opt/trinity/include/kde/mimetypetree.h
+debian/tmp/opt/trinity/include/tde/mimetypetree.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/cddaPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/cddaPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/command.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/command.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/commandPipe.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/commandPipe.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/decoderPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/decoderPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpegPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpegPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpgPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpgPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/nukePlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/nukePlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/splayPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/splayPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/tplayPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/tplayPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/vorbisPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/vorbisPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/yuvPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/yuvPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/IOFrameQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/IOFrameQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrameQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrameQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/floatFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/floatFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/frame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/frame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/frameQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/frameQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/framer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/framer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/pcmFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/pcmFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawDataBuffer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawDataBuffer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/bufferInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/bufferInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/cddaInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/cddaInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/cdromInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/cdromInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/fileInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/fileInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/httpInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/httpInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/inputDetector.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/inputDetector.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/inputPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/inputPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/inputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/inputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/threadSafeInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/threadSafeInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemHeader.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemHeader.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegVideoLength.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegVideoLength.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/pesSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/pesSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/psSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/psSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/tsSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/tsSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/oggFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/oggFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/ovFramer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/ovFramer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisDecoder.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisDecoder.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisInfo.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisInfo.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/artsOutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/artsOutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/audioTime.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/audioTime.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/avSyncer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/avSyncer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/dspX11OutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/dspX11OutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/outPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/outPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/outputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/outputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/pluginInfo.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/pluginInfo.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/threadSafeOutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/threadSafeOutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioInfo.h
+debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioInfo.h
-debian/tmp/opt/trinity/include/kde/mpeglib/splay/splayDecoder.h
+debian/tmp/opt/trinity/include/tde/mpeglib/splay/splayDecoder.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/abs_thread.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/abs_thread.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/threadQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/threadQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/dynBuffer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/dynBuffer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/file/fileAccess.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/file/fileAccess.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mm_accel.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mm_accel.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx_asm.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx_asm.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/render/pictureArray.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/render/pictureArray.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/render/yuvPicture.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/render/yuvPicture.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/syncClock.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/syncClock.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStamp.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStamp.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStampArray.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStampArray.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/timeWrapper.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/timeWrapper.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/buffer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/buffer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.idl
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.idl
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.idl
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.idl
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject_impl.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject_impl.h
-debian/tmp/opt/trinity/include/kde/noatun/app.h
+debian/tmp/opt/trinity/include/tde/noatun/app.h
-debian/tmp/opt/trinity/include/kde/noatun/controls.h
+debian/tmp/opt/trinity/include/tde/noatun/controls.h
-debian/tmp/opt/trinity/include/kde/noatun/conversion.h
+debian/tmp/opt/trinity/include/tde/noatun/conversion.h
-debian/tmp/opt/trinity/include/kde/noatun/downloader.h
+debian/tmp/opt/trinity/include/tde/noatun/downloader.h
-debian/tmp/opt/trinity/include/kde/noatun/effects.h
+debian/tmp/opt/trinity/include/tde/noatun/effects.h
-debian/tmp/opt/trinity/include/kde/noatun/engine.h
+debian/tmp/opt/trinity/include/tde/noatun/engine.h
-debian/tmp/opt/trinity/include/kde/noatun/equalizer.h
+debian/tmp/opt/trinity/include/tde/noatun/equalizer.h
-debian/tmp/opt/trinity/include/kde/noatun/noatunarts.h
+debian/tmp/opt/trinity/include/tde/noatun/noatunarts.h
-debian/tmp/opt/trinity/include/kde/noatun/player.h
+debian/tmp/opt/trinity/include/tde/noatun/player.h
-debian/tmp/opt/trinity/include/kde/noatun/playlist.h
+debian/tmp/opt/trinity/include/tde/noatun/playlist.h
-debian/tmp/opt/trinity/include/kde/noatun/playlistsaver.h
+debian/tmp/opt/trinity/include/tde/noatun/playlistsaver.h
-debian/tmp/opt/trinity/include/kde/noatun/plugin.h
+debian/tmp/opt/trinity/include/tde/noatun/plugin.h
-debian/tmp/opt/trinity/include/kde/noatun/pluginloader.h
+debian/tmp/opt/trinity/include/tde/noatun/pluginloader.h
-debian/tmp/opt/trinity/include/kde/noatun/pref.h
+debian/tmp/opt/trinity/include/tde/noatun/pref.h
-debian/tmp/opt/trinity/include/kde/noatun/scrollinglabel.h
+debian/tmp/opt/trinity/include/tde/noatun/scrollinglabel.h
-debian/tmp/opt/trinity/include/kde/noatun/stdaction.h
+debian/tmp/opt/trinity/include/tde/noatun/stdaction.h
-debian/tmp/opt/trinity/include/kde/noatun/stereobuttonaction.h
+debian/tmp/opt/trinity/include/tde/noatun/stereobuttonaction.h
-debian/tmp/opt/trinity/include/kde/noatun/tags.h
+debian/tmp/opt/trinity/include/tde/noatun/tags.h
-debian/tmp/opt/trinity/include/kde/noatun/vequalizer.h
+debian/tmp/opt/trinity/include/tde/noatun/vequalizer.h
-debian/tmp/opt/trinity/include/kde/noatun/video.h
+debian/tmp/opt/trinity/include/tde/noatun/video.h
-debian/tmp/opt/trinity/include/kde/noatun/winskinvis.h
+debian/tmp/opt/trinity/include/tde/noatun/winskinvis.h
-debian/tmp/opt/trinity/include/kde/plugin_deps.h
+debian/tmp/opt/trinity/include/tde/plugin_deps.h
 debian/tmp/opt/trinity/lib/libarts_mpeglib.so
 debian/tmp/opt/trinity/lib/libarts_splay.so
 debian/tmp/opt/trinity/lib/libartsbuilder.so

debian/lenny/tdenetwork/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdenetwork/debian/kopete-trinity.install

@@ -1,9 +1,9 @@
 debian/tmp/opt/trinity/bin/kopete
 debian/tmp/opt/trinity/bin/kopete_latexconvert.sh
-debian/tmp/opt/trinity/include/kde/kopete/kopetepicture.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepicture.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteprefs.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteprefs.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addressbooklinkwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addressbooklinkwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/webcamwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/webcamwidget.h
 debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update
 debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update
 debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update

debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdenetwork/debian/rules

@@ -17,7 +17,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install

@@ -1,66 +1,66 @@
-debian/tmp/opt/trinity/include/kde/kopete/kabcpersistence.h
+debian/tmp/opt/trinity/include/tde/kopete/kabcpersistence.h
-debian/tmp/opt/trinity/include/kde/kopete/kopete_export.h
+debian/tmp/opt/trinity/include/tde/kopete/kopete_export.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteaccount.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteaccount.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteaccountmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteaccountmanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteaway.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteaway.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteawayaction.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteawayaction.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteawaydialog.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteawaydialog.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteblacklister.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteblacklister.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetechatsession.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetechatsession.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetechatsessionmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetechatsessionmanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecommandhandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecommandhandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontact.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontact.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlist.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlist.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlistelement.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlistelement.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontactproperty.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontactproperty.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteeventpresentation.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteeventpresentation.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteglobal.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteglobal.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetegroup.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetegroup.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessage.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessage.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessageevent.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessageevent.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandlerchain.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandlerchain.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemetacontact.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemetacontact.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemimetypehandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemimetypehandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetenotifydataobject.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetenotifydataobject.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatus.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatus.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatusmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatusmanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetepassword.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepassword.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetepasswordedaccount.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepasswordedaccount.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteplugin.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteplugin.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteprotocol.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteprotocol.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetesimplemessagehandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetesimplemessagehandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetetask.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetetask.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetetransfermanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetetransfermanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteuiglobal.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteuiglobal.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteversion.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteversion.h
-debian/tmp/opt/trinity/include/kde/kopete/managedconnectionaccount.h
+debian/tmp/opt/trinity/include/tde/kopete/managedconnectionaccount.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/accountselector.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/accountselector.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addcontactpage.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addcontactpage.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectordialog.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectorwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectorwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/editaccountwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/editaccountwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/fileconfirmbase.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/fileconfirmbase.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteawaydialogbase.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteawaydialogbase.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetecontactaction.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetecontactaction.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetefileconfirmdialog.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetefileconfirmdialog.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistview.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistview.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewitem.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewitem.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewsearchline.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewsearchline.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepassworddialog.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepassworddialog.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidgetbase.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidgetbase.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetestdaction.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetestdaction.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteview.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteview.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteviewplugin.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteviewplugin.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/userinfodialog.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/userinfodialog.h
-debian/tmp/opt/trinity/include/kde/rss/article.h
+debian/tmp/opt/trinity/include/tde/rss/article.h
-debian/tmp/opt/trinity/include/kde/rss/document.h
+debian/tmp/opt/trinity/include/tde/rss/document.h
-debian/tmp/opt/trinity/include/kde/rss/global.h
+debian/tmp/opt/trinity/include/tde/rss/global.h
-debian/tmp/opt/trinity/include/kde/rss/image.h
+debian/tmp/opt/trinity/include/tde/rss/image.h
-debian/tmp/opt/trinity/include/kde/rss/librss.h
+debian/tmp/opt/trinity/include/tde/rss/librss.h
-debian/tmp/opt/trinity/include/kde/rss/loader.h
+debian/tmp/opt/trinity/include/tde/rss/loader.h
-debian/tmp/opt/trinity/include/kde/rss/textinput.h
+debian/tmp/opt/trinity/include/tde/rss/textinput.h
 debian/tmp/opt/trinity/lib/libtdeinit_kdict.la
 debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la
 debian/tmp/opt/trinity/lib/libkopete.la
@@ -73,4 +73,4 @@ debian/tmp/opt/trinity/lib/libkopete_videodevice.la
 debian/tmp/opt/trinity/lib/libkopete_videodevice.so
 debian/tmp/opt/trinity/lib/librss.la
 debian/tmp/opt/trinity/lib/librss.so
-debian/tmp/opt/trinity/include/kde/kopete/kopetepluginmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepluginmanager.h

debian/lenny/tdepim/debian/changelog

@@ -706,7 +706,7 @@ tdepim (4:3.5.6-0ubuntu3) feisty; urgency=low
     - Activates networkstatus support for kmail (patch from SuSE)
   * debian/control:
     - New package networkstatus-dev
-  * ./libtdepim1-dev.install: added /usr/include/kde/kpimprefs.h
+  * ./libtdepim1-dev.install: added /usr/include/tde/kpimprefs.h
 
  -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 02 Feb 2007 15:37:42 +0100
 

debian/lenny/tdepim/debian/libindex0-trinity-dev.install

@@ -1,4 +1,4 @@
 /opt/trinity/bin/indexlib-config
-/opt/trinity/include/kde/index
+/opt/trinity/include/tde/index
 /opt/trinity/lib/libindex.la
 /opt/trinity/lib/libindex.so

debian/lenny/tdepim/debian/libkcal2-trinity-dev.install

@@ -1,5 +1,5 @@
-/opt/trinity/include/kde/libemailfunctions/idmapper.h
+/opt/trinity/include/tde/libemailfunctions/idmapper.h
-/opt/trinity/include/kde/libkcal
+/opt/trinity/include/tde/libkcal
 /opt/trinity/lib/libkcal.la
 /opt/trinity/lib/libkcal.so
 /opt/trinity/lib/libkcal_resourceremote.la

debian/lenny/tdepim/debian/libkgantt0-trinity-dev.install

@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/kgantt
+/opt/trinity/include/tde/kgantt
 /opt/trinity/lib/libkgantt.la
 /opt/trinity/lib/libkgantt.so

debian/lenny/tdepim/debian/libkleopatra1-trinity-dev.install

@@ -1,6 +1,6 @@
-/opt/trinity/include/kde/gpgme++
+/opt/trinity/include/tde/gpgme++
-/opt/trinity/include/kde/kleo
+/opt/trinity/include/tde/kleo
-/opt/trinity/include/kde/qgpgme
+/opt/trinity/include/tde/qgpgme
 /opt/trinity/lib/libgpgme++.la
 /opt/trinity/lib/libgpgme++.so
 /opt/trinity/lib/libkleopatra.la

debian/lenny/tdepim/debian/libkpimexchange1-trinity-dev.install

@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/tdepim/exchangeaccount.h
+/opt/trinity/include/tde/tdepim/exchangeaccount.h
-/opt/trinity/include/kde/tdepim/exchangeclient.h
+/opt/trinity/include/tde/tdepim/exchangeclient.h
 /opt/trinity/lib/libkpimexchange.la
 /opt/trinity/lib/libkpimexchange.so

debian/lenny/tdepim/debian/libksieve0-trinity-dev.install

@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/ksieve
+/opt/trinity/include/tde/ksieve
 /opt/trinity/lib/libksieve.la
 /opt/trinity/lib/libksieve.so

debian/lenny/tdepim/debian/libktnef1-trinity-dev.install

@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/ktnef
+/opt/trinity/include/tde/ktnef
 /opt/trinity/lib/libktnef.la
 /opt/trinity/lib/libktnef.so

debian/lenny/tdepim/debian/libmimelib1-trinity-dev.install

@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/mimelib
+/opt/trinity/include/tde/mimelib
 /opt/trinity/lib/libmimelib.la
 /opt/trinity/lib/libmimelib.so

debian/lenny/tdepim/debian/libtdepim1-trinity-dev.install

@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/tdepimmacros.h
+/opt/trinity/include/tde/tdepimmacros.h
 /opt/trinity/lib/libtdepim.la
 /opt/trinity/lib/libtdepim.so

debian/lenny/tdepim/debian/tdepim-trinity-dev.install

@@ -1,15 +1,15 @@
-/opt/trinity/include/kde/KNotesAppIface.h
+/opt/trinity/include/tde/KNotesAppIface.h
-/opt/trinity/include/kde/KNotesIface.h
+/opt/trinity/include/tde/KNotesIface.h
-/opt/trinity/include/kde/akregator
+/opt/trinity/include/tde/akregator
-/opt/trinity/include/kde/calendar
+/opt/trinity/include/tde/calendar
-/opt/trinity/include/kde/kabc
+/opt/trinity/include/tde/kabc
-/opt/trinity/include/kde/kaddressbook
+/opt/trinity/include/tde/kaddressbook
-/opt/trinity/include/kde/kmail
+/opt/trinity/include/tde/kmail
-/opt/trinity/include/kde/kmailIface.h
+/opt/trinity/include/tde/kmailIface.h
-/opt/trinity/include/kde/kmailicalIface.h
+/opt/trinity/include/tde/kmailicalIface.h
-/opt/trinity/include/kde/kmailpartIface.h
+/opt/trinity/include/tde/kmailpartIface.h
-/opt/trinity/include/kde/kontact
+/opt/trinity/include/tde/kontact
-/opt/trinity/include/kde/korganizer
+/opt/trinity/include/tde/korganizer
 /opt/trinity/lib/libkabckolab.la
 /opt/trinity/lib/libkabckolab.so
 /opt/trinity/lib/libkabcscalix.la
@@ -81,4 +81,4 @@
 /opt/trinity/lib/libgwsoap.la
 /opt/trinity/lib/libgwsoap.so
 
-/opt/trinity/include/kde/kpimprefs.h
+/opt/trinity/include/tde/kpimprefs.h

debian/lenny/tdesdk/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdesdk/debian/changelog

@@ -931,7 +931,7 @@ tdesdk (2.2.2-3) unstable; urgency=low
 
 tdesdk (2.2.2-2) unstable; urgency=low
 
-  * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449).
+  * Moved kspy.h to /usr/include/tde (closes: Bug#122448, Bug#122449).
 
  -- Ben Burton <benb@acm.org>  Thu,  6 Dec 2001 09:50:47 -0600
 

debian/lenny/tdesdk/debian/kbabel-trinity-dev.install

@@ -1,24 +1,24 @@
-debian/tmp/opt/trinity/include/kde/kbabel/catalog.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalog.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogfileplugin.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogfileplugin.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogitem.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogitem.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogsettings.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogsettings.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogview.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogview.h
-debian/tmp/opt/trinity/include/kde/kbabel/dictchooser.h
+debian/tmp/opt/trinity/include/tde/kbabel/dictchooser.h
-debian/tmp/opt/trinity/include/kde/kbabel/dictionarymenu.h
+debian/tmp/opt/trinity/include/tde/kbabel/dictionarymenu.h
-debian/tmp/opt/trinity/include/kde/kbabel/editcmd.h
+debian/tmp/opt/trinity/include/tde/kbabel/editcmd.h
-debian/tmp/opt/trinity/include/kde/kbabel/findoptions.h
+debian/tmp/opt/trinity/include/tde/kbabel/findoptions.h
-debian/tmp/opt/trinity/include/kde/kbabel/itempart.h
+debian/tmp/opt/trinity/include/tde/kbabel/itempart.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbabeldatatool.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbabeldatatool.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictbox.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictbox.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictiface.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictiface.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbproject.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbproject.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbprojectmanager.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbprojectmanager.h
-debian/tmp/opt/trinity/include/kde/kbabel/msgfmt.h
+debian/tmp/opt/trinity/include/tde/kbabel/msgfmt.h
-debian/tmp/opt/trinity/include/kde/kbabel/poinfo.h
+debian/tmp/opt/trinity/include/tde/kbabel/poinfo.h
-debian/tmp/opt/trinity/include/kde/kbabel/projectsettings.h
+debian/tmp/opt/trinity/include/tde/kbabel/projectsettings.h
-debian/tmp/opt/trinity/include/kde/kbabel/regexpextractor.h
+debian/tmp/opt/trinity/include/tde/kbabel/regexpextractor.h
-debian/tmp/opt/trinity/include/kde/kbabel/searchengine.h
+debian/tmp/opt/trinity/include/tde/kbabel/searchengine.h
-debian/tmp/opt/trinity/include/kde/kbabel/tagextractor.h
+debian/tmp/opt/trinity/include/tde/kbabel/tagextractor.h
 debian/tmp/opt/trinity/lib/libkbabelcommon.la
 debian/tmp/opt/trinity/lib/libkbabelcommon.so
 debian/tmp/opt/trinity/lib/libkbabeldictplugin.la

debian/lenny/tdesdk/debian/kmtrace-trinity.install

@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle
 debian/tmp/opt/trinity/bin/kminspector
 debian/tmp/opt/trinity/bin/kmmatch
 debian/tmp/opt/trinity/bin/kmtrace
-debian/tmp/opt/trinity/include/kde/ktrace.h
+debian/tmp/opt/trinity/include/tde/ktrace.h
 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/lenny/tdesdk/debian/kspy-trinity.install

@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde/kspy.h
+debian/tmp/opt/trinity/include/tde/kspy.h
 debian/tmp/opt/trinity/lib/libkspy.la
 debian/tmp/opt/trinity/lib/libkspy.so
 debian/tmp/opt/trinity/lib/libkspy.so.1

debian/lenny/tdesdk/debian/kunittest-trinity.install

@@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la
 debian/tmp/opt/trinity/lib/libkunittestgui.so
 debian/tmp/opt/trinity/lib/libkunittestgui.so.0
 debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0
-debian/tmp/opt/trinity/include/kde/kunittest/runnergui.h
+debian/tmp/opt/trinity/include/tde/kunittest/runnergui.h

debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install

@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/include/kde/cvsjob_stub.h
+debian/tmp/opt/trinity/include/tde/cvsjob_stub.h
-debian/tmp/opt/trinity/include/kde/cvsservice_stub.h
+debian/tmp/opt/trinity/include/tde/cvsservice_stub.h
-debian/tmp/opt/trinity/include/kde/repository_stub.h
+debian/tmp/opt/trinity/include/tde/repository_stub.h
 debian/tmp/opt/trinity/lib/libcvsservice.la
 debian/tmp/opt/trinity/lib/libcvsservice.so
 debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la

debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdesdk/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install

@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde/kprofilemethod.h
+debian/tmp/opt/trinity/include/tde/kprofilemethod.h
 debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
 debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so

debian/lenny/tdetoys/debian/amor-trinity.install

@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/amor
-debian/tmp/opt/trinity/include/kde/AmorIface.h
+debian/tmp/opt/trinity/include/tde/AmorIface.h
 debian/tmp/opt/trinity/share/apps/amor
 debian/tmp/opt/trinity/share/applications/kde/amor.desktop
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/*.bz2

debian/lenny/tdetoys/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdetoys/debian/changelog

@@ -609,7 +609,7 @@ tdetoys (4:2.2.2-3) unstable; urgency=low
 
 tdetoys (4:2.2.2-2) unstable; urgency=low
 
-  * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447).
+  * Moved AmorIface.h to /usr/include/tde (closes: Bug#122447).
 
  -- Ben Burton <benb@acm.org>  Sun,  9 Dec 2001 09:07:02 -0600
 

debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdetoys/debian/rules

@@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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 --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdetoys-trinity-dbg
 

debian/lenny/tdeutils/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdeutils/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install

@@ -1,18 +1,18 @@
-debian/tmp/opt/trinity/include/kde/kmultiformlistbox.h
+debian/tmp/opt/trinity/include/tde/kmultiformlistbox.h
-debian/tmp/opt/trinity/include/kde/kmultiformlistboxentry.h
+debian/tmp/opt/trinity/include/tde/kmultiformlistboxentry.h
-debian/tmp/opt/trinity/include/kde/kmultiformlistboxfactory.h
+debian/tmp/opt/trinity/include/tde/kmultiformlistboxfactory.h
-debian/tmp/opt/trinity/include/kde/ksim/chart.h
+debian/tmp/opt/trinity/include/tde/ksim/chart.h
-debian/tmp/opt/trinity/include/kde/ksim/common.h
+debian/tmp/opt/trinity/include/tde/ksim/common.h
-debian/tmp/opt/trinity/include/kde/ksim/ksimconfig.h
+debian/tmp/opt/trinity/include/tde/ksim/ksimconfig.h
-debian/tmp/opt/trinity/include/kde/ksim/label.h
+debian/tmp/opt/trinity/include/tde/ksim/label.h
-debian/tmp/opt/trinity/include/kde/ksim/led.h
+debian/tmp/opt/trinity/include/tde/ksim/led.h
-debian/tmp/opt/trinity/include/kde/ksim/pluginglobal.h
+debian/tmp/opt/trinity/include/tde/ksim/pluginglobal.h
-debian/tmp/opt/trinity/include/kde/ksim/pluginloader.h
+debian/tmp/opt/trinity/include/tde/ksim/pluginloader.h
-debian/tmp/opt/trinity/include/kde/ksim/pluginmodule.h
+debian/tmp/opt/trinity/include/tde/ksim/pluginmodule.h
-debian/tmp/opt/trinity/include/kde/ksim/progress.h
+debian/tmp/opt/trinity/include/tde/ksim/progress.h
-debian/tmp/opt/trinity/include/kde/ksim/themeloader.h
+debian/tmp/opt/trinity/include/tde/ksim/themeloader.h
-debian/tmp/opt/trinity/include/kde/ksim/themetypes.h
+debian/tmp/opt/trinity/include/tde/ksim/themetypes.h
-debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h
+debian/tmp/opt/trinity/include/tde/kwidgetstreamer.h
 debian/tmp/opt/trinity/lib/libkcmlaptop.la
 debian/tmp/opt/trinity/lib/libkcmlaptop.so
 debian/tmp/opt/trinity/lib/libtdeinit_ark.la

debian/lenny/tdevelop/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdevelop/debian/rules

@@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/lenny/tdevelop/debian/tdevelop-trinity-dev.install

@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde
+debian/tmp/opt/trinity/include/tde
 debian/tmp/opt/trinity/lib/lib*.so
 debian/tmp/opt/trinity/lib/lib*.la

debian/lenny/tdewebdev/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/lenny/tdewebdev/debian/kommander-trinity-dev.install

@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/include/kde/kommander*
+debian/tmp/opt/trinity/include/tde/kommander*
 debian/tmp/opt/trinity/lib/libkommanderplugin.la
 debian/tmp/opt/trinity/lib/libkommanderplugin.so
 debian/tmp/opt/trinity/lib/libkommanderwidget.la
 debian/tmp/opt/trinity/lib/libkommanderwidget.so
 debian/tmp/opt/trinity/lib/libkommanderwidgets.so
-debian/tmp/opt/trinity/include/kde/specials.h
+debian/tmp/opt/trinity/include/tde/specials.h

debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/usr/include/kde/kde.pot
++kdepotpath=/usr/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/lenny/tdewebdev/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/adept/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/adept/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/amarok/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/amarok/debian/rules

@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/basket/debian/rules

@@ -3,7 +3,7 @@
 
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/bibletime/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/bibletime/debian/rules

@@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian
 
 DEB_BUILDDIR = $(DEB_SRCDIR)
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/squeeze/applications/desktop-effects-tde/debian/rules

@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/digikam/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/digikam/debian/digikam-trinity.install

@@ -1,5 +1,5 @@
 opt/trinity/bin/digi*
-/opt/trinity/include/kde
+/opt/trinity/include/tde
 opt/trinity/lib
 /opt/trinity/share/apps/digikam
 /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop

debian/squeeze/applications/digikam/debian/rules

@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/filelight-l10n/debian/rules

@@ -7,7 +7,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -17,7 +17,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 #DEB_PATCHDIRS := debian/patches/common debian/patches
 #DEB_INSTALL_DOCS_ALL :=
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 post-patches:: debian/stamp-bootstrap
 

debian/squeeze/applications/filelight/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/filelight/debian/rules

@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/gtk-qt-engine/debian/rules

@@ -15,7 +15,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -24,7 +24,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
-DEB_CMAKE_EXTRA_FLAGS := -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/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
+DEB_CMAKE_EXTRA_FLAGS := -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" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
 
 binary-install/gtk-qt-engine-trinity::
 	mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/

debian/squeeze/applications/gwenview/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/gwenview/debian/rules

@@ -7,7 +7,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/k3b/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/k3b/debian/rules

@@ -11,7 +11,7 @@ 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 = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde"
+DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde"
 
 DEB_INSTALL_MANPAGES_k3b = debian/k3b.1
 

debian/squeeze/applications/k3b/debian/trinity.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/k9copy/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/k9copy/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
 
 post-patches:: debian/stamp-bootstrap
 

debian/squeeze/applications/kaffeine-mozilla/debian/rules

@@ -14,7 +14,7 @@ export DH_OPTIONS
 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/kde
+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

debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install

@@ -13,7 +13,7 @@ debian/tmp/opt/trinity/share/doc/
 debian/tmp/opt/trinity/share/icons/
 debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop
 debian/tmp/opt/trinity/share/locale/
-debian/tmp/opt/trinity/include/kde/kaffeine/*h
+debian/tmp/opt/trinity/include/tde/kaffeine/*h
 debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop
 debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la
 debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so

debian/squeeze/applications/kaffeine/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/katapult/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/katapult/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kbarcode/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/kbfx/debian/rules

@@ -7,21 +7,21 @@ URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME)
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
 #CMAKE_LIBRARY_PATH := /opt/trinity/lib 
-#CMAKE_INCLUDE_PATH := /opt/trinity/include/kde
+#CMAKE_INCLUDE_PATH := /opt/trinity/include/tde
 
 include debian/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/"
+DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/"
 
 get-orig-source:
 	@@dh_testdir

debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kbookreader/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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 --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
 
 post-patches:: debian/stamp-bootstrap
 

debian/squeeze/applications/kchmviewer/debian/debiandirs

@@ -1,6 +1,6 @@
 export kde_prefix=/usr
 export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
 export infodir=/usr/share/info
 export mandir=/usr/share/man
 export qtdir=/usr/share/qt3

debian/squeeze/applications/kchmviewer/debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -27,7 +27,7 @@ CFLAGS = -Wall -g
 CONFIGURE_OPTIONS_KDE = \
 	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
-	--includedir=/opt/trinity/include/kde --mandir=/opt/trinity/share/man \
+	--includedir=/opt/trinity/include/tde --mandir=/opt/trinity/share/man \
 	--with-qt-dir=$(qtdir) \
 	--sysconfdir=$(sysconfdir) \
 	--infodir=/opt/trinity/share/info \

debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kcpuload/debian/rules

@@ -5,7 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -79,7 +79,7 @@ configure-stamp:
 
 	# run configure with build tree $(objdir)
 	cd $(objdir) && \
-	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
 	touch configure-stamp
 

debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kdbusnotification/debian/rules

@@ -5,7 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -78,7 +78,7 @@ configure-stamp:
 
 	# run configure with build tree $(objdir)
 	cd $(objdir) && \
-	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
 	touch configure-stamp
 

debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kdiff3/debian/rules

@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -37,7 +37,7 @@ config.status:
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	
 	make -f admin/Makefile.common cvs
-	CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+	CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 
 build: build-stamp

debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kdirstat/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 LDFLAGS += -Wl,--as-needed
 

debian/squeeze/applications/kdpkg/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/keep/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff

@@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/usr/include/kde/kde.pot
++kdepotpath=/usr/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/squeeze/applications/keep/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_INSTALL_MANPAGES_keep := keep.1
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/squeeze/applications/kerry/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kerry/debian/rules

@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 # include /usr/share/cdbs/1/class/kde.mk
 include debian/cdbs/debian-qt-kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/kile/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kile/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -15,7 +15,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 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/kde
+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/squeeze/applications/kima/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kio-apt/debian/rules

@@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kio-umountwrapper/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/squeeze/applications/kmplayer/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kmplayer/debian/rules

@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3)
   CXX = g++ -fpermissive
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1
 

debian/squeeze/applications/kmyfirewall/debian/debiandirs

@@ -1,6 +1,6 @@
 export kde_prefix=/usr
 export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
 export infodir=/usr/share/info
 export mandir=/usr/share/man
 export qtdir=/usr/share/qt3

debian/squeeze/applications/kmyfirewall/debian/rules

@@ -6,7 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -56,7 +56,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+	CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 
 build: build-stamp
@@ -65,7 +65,7 @@ build-stamp:  config.status
 	dh_testdir
 
 	# Add here commands to compile the package.
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
 
 	touch build-stamp
 
@@ -94,7 +94,7 @@ install: build
 	dh_clean -k 
 
 	# Add here commands to install the package into debian/kmyfirewall.
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity
 
 	rm -f debian/kmyfirewall-trinity/opt/trinity/lib/*.so
 	chrpath -d debian/kmyfirewall-trinity/opt/trinity/bin/kmyfirewall debian/kmyfirewall-trinity/opt/trinity/lib/*.so.* debian/kmyfirewall-trinity/opt/trinity/lib/trinity/*.so

debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install

@@ -1,3 +1,3 @@
-opt/trinity/include/kde/kmymoney/*
+opt/trinity/include/tde/kmymoney/*
 opt/trinity/lib/lib*.la
 opt/trinity/lib/lib*.so

debian/squeeze/applications/kmymoney/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde --disable-sqlite3
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3
 
 LDFLAGS += -Wl,--as-needed
 

debian/squeeze/applications/knemo/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/knemo/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_INSTALL_DOCS_knemo = -XNEWS
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/squeeze/applications/knetload/debian/rules

@@ -2,7 +2,7 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -74,7 +74,7 @@ configure-stamp:
 
 	# run configure with build tree $(objdir)
 	cd $(objdir) && \
-	../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+	../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 	touch configure-stamp
 

debian/squeeze/applications/knetstats/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/knetstats/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/knetworkmanager8/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/knights/debian/debiandirs

@@ -1,6 +1,6 @@
 export kde_prefix=/usr
 export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
 export infodir=/usr/share/info
 export mandir=/usr/share/man
 export qtdir=/usr/share/qt3

debian/squeeze/applications/knights/debian/rules

@@ -6,7 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -51,7 +51,7 @@ config.status: configure patch
 
 	if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	--disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/kde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+	--disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/tde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
 
 build: build-stamp

debian/squeeze/applications/knowit/debian/rules

@@ -7,7 +7,7 @@
 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/kde
+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

debian/squeeze/applications/knutclient/debian/rules

@@ -11,7 +11,7 @@
 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/kde
+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

debian/squeeze/applications/koffice/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install

@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde
+debian/tmp/opt/trinity/include/tde
 debian/tmp/opt/trinity/lib/libkarboncommon.la
 debian/tmp/opt/trinity/lib/libkarboncommon.so
 debian/tmp/opt/trinity/lib/libkchartcommon.la

debian/squeeze/applications/koffice/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/konversation/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/konversation/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg
 DEB_INSTALL_DOCS_ALL = 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/squeeze/applications/kopete-otr/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kopete-otr/debian/rules

@@ -3,14 +3,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/squeeze/applications/kpicosim/debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -52,7 +52,7 @@ build-stamp:  config.status
 	dh_testdir
 
 	# Add here commands to compile the package.
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
 	#docbook-to-man debian/kpicosim.sgml > kpicosim.1
 
 	touch build-stamp

debian/squeeze/applications/kpilot/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kpilot/debian/rules

@@ -3,14 +3,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/squeeze/applications/kpowersave/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kpowersave/debian/rules

@@ -4,7 +4,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -12,7 +12,7 @@ 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_DOCS_ALL := AUTHORS NEWS
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/squeeze/applications/kradio/debian/rules

@@ -9,7 +9,7 @@
 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/kde
+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

debian/squeeze/applications/krename/debian/rules

@@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 ### Libtool and Automake updates
 post-patches:: debian/stamp-autothings-update

debian/squeeze/applications/krusader/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/krusader/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/squeeze/applications/ksplash-engine-moodin/debian/debiandirs

@@ -1,6 +1,6 @@
 export kde_prefix=/opt/trinity
 export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/kde
+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

debian/squeeze/applications/ksplash-engine-moodin/debian/rules

@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -49,7 +49,7 @@ patch: patch-stamp
 config.status: configure patch
 	dh_testdir
 	
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 build: build-stamp
 

debian/squeeze/applications/ksquirrel/debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/kstreamripper/debian/rules

@@ -3,10 +3,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1
 
 build/kstreamripper::	
-	env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE)
+	env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE)
 
 install/kstreamripper::
-	env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install
+	env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install
 	mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/
 	mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/
 	install -m 644 ./src/hi32-app-kstreamripper.png \

debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/ksystemlog/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/squeeze/applications/ktechlab/debian/debiandirs

@@ -1,7 +1,7 @@
 export kde_confdir=/etc/trinity
 export kde_prefix=/opt/trinity
 export kde_bindir=/opt/trinity/bin
-export kde_includedir=/opt/trinity/include/kde
+export kde_includedir=/opt/trinity/include/tde
 export kde_libdir=/opt/trinity/lib
 export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_moduledir=/opt/trinity/lib/trinity

debian/squeeze/applications/ktechlab/debian/rules

@@ -5,7 +5,7 @@
 
 -include debian/debiandirs
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -45,7 +45,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
+	PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
 
 build: build-stamp debian/ktechlab.xpm
 
@@ -55,7 +55,7 @@ build-stamp:  config.status
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
 	touch build-stamp
 
 clean:
@@ -85,8 +85,8 @@ install: build
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
+	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
 	install -D -m 644 debian/ktechlab.xpm debian/ktechlab-trinity/opt/trinity/share/pixmaps/ktechlab.xpm
 	chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/ktechlab
 	chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/microbe

debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/ktorrent/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/debian-qt-kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ 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/kde
+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

debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kuickshow/debian/rules

@@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+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/squeeze/applications/kvirc/debian/rules

@@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/kvkbd/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 makebuilddir/kvkbd-trinity::
 	make -f Makefile.cvs

debian/squeeze/applications/kvpnc/debian/rules

@@ -8,14 +8,14 @@ include /usr/share/cdbs/1/rules/utils.mk
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
 DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 makebuilddir/kvpnc-trinity::
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in

debian/squeeze/applications/piklab/debian/rules

@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -48,7 +48,7 @@ endif
 	./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
-		--with-extra-includes=/opt/trinity/include/kde \
+		--with-extra-includes=/opt/trinity/include/tde \
 		--mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --enable-rpath
 	touch $@
 

debian/squeeze/applications/potracegui/debian/rules

@@ -11,7 +11,7 @@
 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/kde
+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

debian/squeeze/applications/smb4k/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/smb4k/debian/rules

@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/soundkonverter/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/tde-guidance/debian/rules

@@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_UPDATE_RCD_PARAMS := multiuser
 DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/displayconfig-trinity.1  debian/mountconfig-trinity.1  debian/serviceconfig-trinity.1  debian/userconfig-trinity.1
 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 LDFLAGS_APPEND := -L/opt/trinity/lib
 
 install/tde-guidance-trinity::

debian/squeeze/applications/tde-style-lipstik/debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -37,7 +37,7 @@ config.status: patch configure
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
                 --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
                 --disable-debug --enable-final \
-		--with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+		--with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 #               --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/ 
 
 build: build-stamp

debian/squeeze/applications/tde-systemsettings/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/tde-systemsettings/debian/rules

@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/tdesudo/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/tdesudo/debian/rules

@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1
 

debian/squeeze/applications/tdmtheme/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/tdmtheme/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -13,7 +13,7 @@ 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+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/squeeze/applications/tellico/debian/rules

@@ -5,7 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/twin-style-crystal/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/twin-style-crystal/debian/rules

@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/applications/yakuake/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/applications/yakuake/debian/rules

@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/dependencies/arts/debian/rules

@@ -14,7 +14,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
-DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -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/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON"
+DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -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" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.

debian/squeeze/dependencies/libcaldav/debian/README.Debian

@@ -0,0 +1,45 @@
+		Imlib Version 11
+		----------------
+
+Imlib11 is linked with libpng12, which began life as libpng3.  This is
+in accordance with the practice of Redhat.  The GDK version of imlib,
+being part of GNOME 1, has remained linked with libpng2.
+
+No library that links with this version of Imlib may also link with
+libpng2.
+
+No application that links with this version of Imlib may link with
+libpng2, neither directly nor through a third library.
+
+If you accidentally link an application with imlib and libpng2, the
+application may behave in unpredictible ways, possibly crashing,
+possibly emitting warnings similar to the following:
+
+  libpng warning: Application was compiled with png.h from libpng-1.2.1
+  libpng warning: Application  is running with png.c from libpng-1.0.12
+  libpng error: Incompatible libpng version in application and library
+
+
+
+		Imlib Version 1
+		---------------
+
+Imlib1 and gdk-imlib1 are compiled against libpng2.  If you need to
+build with libpng2, install the package imlib1-dev or gdk-imlib1-dev
+as appropriate.
+
+
+		The Palette File
+		----------------
+
+The system Imlib/Gdk-Imlib palette file was moved from the directory
+`/etc/im' to `/etc/imlib'.  This move may cause problems for users who
+have a `.imrc' file in their home directory since that file may
+contain a reference to the old location of the palette file.  To
+correct this problem, the "PaletteFile" entry should look like:
+
+        PaletteFile /etc/imlib/im_palette.pal
+
+I believe this changed happened in late 1999.
+
+ -- Steve M. Robbins <smr@debian.org>, Sun Oct 19 15:11:42 2003

debian/squeeze/dependencies/libcaldav/debian/README.fallback

@@ -0,0 +1,23 @@
+		Imlib Image Conversion
+		----------------------
+
+The imlib and gdk-imlib libraries have a number of built-in image
+conversion routines, and are capable of loading or saving in *at
+least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and
+PPM.
+
+Prior to version 1.9.13, imlib and gdk-imlib could use an external
+program, such as Imagemagick's "convert", to load or save images
+in formats not handled internally to Imlib.  
+
+
+
+		"All fallbacks failed."
+		-----------------------
+
+This message indicates that the file you wished to load is not handled
+by Imlib.
+
+The remedy is to convert the image file by hand using, for example,
+Imagemagick's "convert" command: "convert foo.rgb foo.png".  Then
+you'll have to fix up the application to use the new filename instead.

debian/squeeze/dependencies/libcaldav/debian/changelog

@@ -0,0 +1,29 @@
+libcaldav (0.6.5-2debian2) maverick; urgency=low
+
+  * Fixed RECURRENCE-ID modification with Zimbra CalDAV resources
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 28 Aug 2010 16:34:00 -0600
+
+libcaldav (0.6.4-0debian0) lenny; urgency=low
+
+  * Added VTODO support
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 27 Aug 2010 18:53:00 -0600
+
+libcaldav (0.6.3-0debian1) lenny; urgency=low
+
+  * Multiple VEVENT blocks in a single CardDAV response are now returned correctly
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 26 Aug 2010 15:40:00 -0600
+
+libcaldav (0.6.2-0debian0) lenny; urgency=low
+
+  * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 18 Jul 2010 15:29:00 -0600
+
+libcaldav (0.6.1-1debian0) lenny; urgency=low
+
+  * Initial Lenny build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 31 May 2010 01:55:00 -0600

debian/squeeze/dependencies/libcaldav/debian/compat

@@ -0,0 +1 @@
+5

debian/squeeze/dependencies/libcaldav/debian/control

@@ -0,0 +1,23 @@
+Source: libcaldav
+Build-Depends: debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Section: graphics
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Standards-Version: 3.8.3
+
+Package: libcaldav
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: 
+ libcaldav provides a C interface for caldav PIM clients
+
+Package: libcaldav-dev
+Architecture: any
+Section: libdevel
+Depends: libcaldav (= ${binary:Version})
+Description: 
+ libcaldav provides a C interface for caldav PIM clients
+ .
+ This is the development package containing header files and link
+ libraries for libcaldav.

debian/squeeze/dependencies/libcaldav/debian/copyright

@@ -0,0 +1,13 @@
+This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+
+It was downloaded from http://sourceforge.net/projects/libcaldav/
+
+Copyright:
+
+Copyright 2008 by Michael Rasmussen (mir@datanom.net)
+
+License:
+
+All libraries in this package are released under the GPL
+(/usr/share/common-licenses/GPL-3).  The programs and examples are
+under the GPL (/usr/share/common-licenses/GPL).

debian/squeeze/dependencies/libcaldav/debian/rules

@@ -0,0 +1,105 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export CFLAGS = -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O3
+endif
+
+# Suppress accidental execution of the auto-* tools, c.f.
+# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html
+no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
+	AUTOCONF="`pwd`/missing autoconf" \
+	AUTOMAKE="`pwd`/missing automake" \
+	AUTOHEADER="`pwd`/missing autoheader"
+
+make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
+
+build: $(QUILT_STAMPFN) build-stamp
+build-stamp:
+	dh_testdir
+	./autogen.sh
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man
+	$(MAKE) $(make_flags)
+
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+	dh_clean
+
+install: DH_OPTIONS=
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install
+
+	dh_movefiles
+
+	# Library package
+	dh_install -plibcaldav --autodest debian/tmp/usr/lib/libcaldav.so*
+
+	# Developer package
+	mv debian/tmp/usr/include/libcaldav* debian/tmp/usr/include/libcaldav
+	dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/libcaldav.la
+	dh_install -plibcaldav-dev --autodest debian/tmp/usr/include/libcaldav/*
+	dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/pkgconfig/*
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installdocs -A debian/README.Debian
+	dh_installexamples
+	dh_installmenu
+	dh_installcron
+	dh_installinfo
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_strip
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independent packages using the common target.
+binary-indep: build install
+	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependent packages using the common target.
+binary-arch: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+	make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

debian/squeeze/dependencies/libcaldav/debian/watch

@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz

debian/squeeze/dependencies/libcarddav/debian/README.Debian

@@ -0,0 +1,45 @@
+		Imlib Version 11
+		----------------
+
+Imlib11 is linked with libpng12, which began life as libpng3.  This is
+in accordance with the practice of Redhat.  The GDK version of imlib,
+being part of GNOME 1, has remained linked with libpng2.
+
+No library that links with this version of Imlib may also link with
+libpng2.
+
+No application that links with this version of Imlib may link with
+libpng2, neither directly nor through a third library.
+
+If you accidentally link an application with imlib and libpng2, the
+application may behave in unpredictible ways, possibly crashing,
+possibly emitting warnings similar to the following:
+
+  libpng warning: Application was compiled with png.h from libpng-1.2.1
+  libpng warning: Application  is running with png.c from libpng-1.0.12
+  libpng error: Incompatible libpng version in application and library
+
+
+
+		Imlib Version 1
+		---------------
+
+Imlib1 and gdk-imlib1 are compiled against libpng2.  If you need to
+build with libpng2, install the package imlib1-dev or gdk-imlib1-dev
+as appropriate.
+
+
+		The Palette File
+		----------------
+
+The system Imlib/Gdk-Imlib palette file was moved from the directory
+`/etc/im' to `/etc/imlib'.  This move may cause problems for users who
+have a `.imrc' file in their home directory since that file may
+contain a reference to the old location of the palette file.  To
+correct this problem, the "PaletteFile" entry should look like:
+
+        PaletteFile /etc/imlib/im_palette.pal
+
+I believe this changed happened in late 1999.
+
+ -- Steve M. Robbins <smr@debian.org>, Sun Oct 19 15:11:42 2003

debian/squeeze/dependencies/libcarddav/debian/README.fallback

@@ -0,0 +1,23 @@
+		Imlib Image Conversion
+		----------------------
+
+The imlib and gdk-imlib libraries have a number of built-in image
+conversion routines, and are capable of loading or saving in *at
+least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and
+PPM.
+
+Prior to version 1.9.13, imlib and gdk-imlib could use an external
+program, such as Imagemagick's "convert", to load or save images
+in formats not handled internally to Imlib.  
+
+
+
+		"All fallbacks failed."
+		-----------------------
+
+This message indicates that the file you wished to load is not handled
+by Imlib.
+
+The remedy is to convert the image file by hand using, for example,
+Imagemagick's "convert" command: "convert foo.rgb foo.png".  Then
+you'll have to fix up the application to use the new filename instead.

debian/squeeze/dependencies/libcarddav/debian/changelog

@@ -0,0 +1,17 @@
+libcarddav (0.6.2-2debian2) maverick; urgency=low
+
+  * Modified contact list grabber to first execute a WebDAV directory list, then use the results to get only the contact files in that directory.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 21 Jul 2010 02:55:00 -0600
+
+libcarddav (0.6.2-0debian1) lenny; urgency=low
+
+  * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 18 Jul 2010 15:29:00 -0600
+
+libcarddav (0.6.2-0debian0) lenny; urgency=low
+
+  * Initial Lenny build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 31 May 2010 01:55:00 -0600

debian/squeeze/dependencies/libcarddav/debian/compat

@@ -0,0 +1 @@
+5

debian/squeeze/dependencies/libcarddav/debian/control

@@ -0,0 +1,23 @@
+Source: libcarddav
+Build-Depends: debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev
+Section: graphics
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Standards-Version: 3.8.4
+
+Package: libcarddav
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: 
+ libcarddav provides a C interface for carddav PIM clients
+
+Package: libcarddav-dev
+Architecture: any
+Section: libdevel
+Depends: libcarddav (= ${binary:Version})
+Description: 
+ libcarddav provides a C interface for carddav PIM clients
+ .
+ This is the development package containing header files and link
+ libraries for libcarddav.

debian/squeeze/dependencies/libcarddav/debian/copyright

@@ -0,0 +1,14 @@
+This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+
+It was created from unreleased sources derived from libcaldav
+
+Copyright:
+
+Copyright 2010 by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+Copyright 2008 by Michael Rasmussen (mir@datanom.net)
+
+License:
+
+All libraries in this package are released under the GPL
+(/usr/share/common-licenses/GPL-3).  The programs and examples are
+under the GPL (/usr/share/common-licenses/GPL).

debian/squeeze/dependencies/libcarddav/debian/rules

@@ -0,0 +1,105 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export CFLAGS = -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O3
+endif
+
+# Suppress accidental execution of the auto-* tools, c.f.
+# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html
+no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
+	AUTOCONF="`pwd`/missing autoconf" \
+	AUTOMAKE="`pwd`/missing automake" \
+	AUTOHEADER="`pwd`/missing autoheader"
+
+make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
+
+build: $(QUILT_STAMPFN) build-stamp
+build-stamp:
+	dh_testdir
+	./autogen.sh
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man
+	$(MAKE) $(make_flags)
+
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+	dh_clean
+
+install: DH_OPTIONS=
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install
+
+	dh_movefiles
+
+	# Library package
+	dh_install -plibcarddav --autodest debian/tmp/usr/lib/libcarddav.so*
+
+	# Developer package
+	mv debian/tmp/usr/include/libcarddav* debian/tmp/usr/include/libcarddav
+	dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/libcarddav.la
+	dh_install -plibcarddav-dev --autodest debian/tmp/usr/include/libcarddav/*
+	dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/pkgconfig/*
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installdocs -A debian/README.Debian
+	dh_installexamples
+	dh_installmenu
+	dh_installcron
+	dh_installinfo
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_strip
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independent packages using the common target.
+binary-indep: build install
+	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependent packages using the common target.
+binary-arch: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+	make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

debian/squeeze/dependencies/libcarddav/debian/watch

@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz

debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/libraries/kipi-plugins/debian/rules

@@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 clean ::
 	rm -f po/*/*.gmo

debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/libraries/libkdcraw/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/libraries/libkexiv2/debian/rules

@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/libraries/libkipi/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/libraries/libksquirrel/debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/libraries/mlt++/debian/rules

@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/libraries/mlt/debian/rules

@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -47,10 +47,10 @@ configure-stamp:
 
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 
-	CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --enable-gpl \
+	CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \
 	--luma-compress --disable-mmx $(CONFIGURE_OPTS) \
 	--avformat-shared=/usr --avformat-swscale \
-	--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+	--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 	touch configure-stamp
 
@@ -58,7 +58,7 @@ build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
-	env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -j $(NCPUS)
+	env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -j $(NCPUS)
 
 	touch build-stamp
 
@@ -81,7 +81,7 @@ install: build
 	dh_clean -k 
 	dh_installdirs opt/trinity/lib/mlt0.2.5/modules opt/trinity/share/mlt0.2.5
 
-	env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 #	mkdir debian/tmp/opt/trinity
 #	mv debian/tmp/opt/trinity/lib debian/tmp/opt/trinity/

debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install

@@ -1,4 +1,4 @@
-opt/trinity/include/kde/pythonize.h
+opt/trinity/include/tde/pythonize.h
 opt/trinity/lib/libpythonize.a
 opt/trinity/lib/libpythonize.la
 opt/trinity/lib/libpythonize.so

debian/squeeze/libraries/pytdeextensions/debian/rules

@@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -16,7 +16,7 @@ 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_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 install/pytdeextensions-trinity::
 	# We have no idea if the built product is site-packages or dist-packages
@@ -45,8 +45,8 @@ install/libpythonize0-trinity::
 	# fix binary-or-shlib-defines-rpath
 	chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
 	# fix include directory location
-	mkdir -p debian/tmp/opt/trinity/include/kde
+	mkdir -p debian/tmp/opt/trinity/include/tde
-	mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/kde
+	mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde
 
 clean::
 	rm -rf build

debian/squeeze/tde-i18n/debian/debiandirs

@@ -1,6 +1,6 @@
 export kde_prefix=/opt/trinity
 export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/kde
+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

debian/squeeze/tde-i18n/debian/rules

@@ -24,7 +24,7 @@ I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS))
 
 -include debian/debiandirs
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/tdeaccessibility/debian/ksayit-trinity.install

@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/ksayit
-debian/tmp/opt/trinity/include/kde/ksayit_fxplugin.h
+debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h
 debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la
 debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so
 debian/tmp/opt/trinity/lib/libKTTSD_Lib.la

debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/squeeze/tdeaccessibility/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/tdeaddons/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/squeeze/tdeaddons/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/tdeadmin/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/squeeze/tdeadmin/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/tdeartwork/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/tdeartwork/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/tdebase/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 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: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 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, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 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, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4

debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff

@@ -1,12 +1,12 @@
 --- starttde
 +++ starttde
-@@ -184,17 +184,17 @@
+@@ -228,17 +228,17 @@
    . $tdehome/share/config/startupconfig
  fi
  
 -# Make sure a default wallpaper is set.
 -if [ ! -e $tdehome/share/config/kdesktoprc ]; then
-- # With Trinity KDE this file should exist, but test first.
+- # With Trinity this file should exist, but test first.
 -  if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
 -cat >$tdehome/share/config/kdesktoprc <<EOF
 -[Desktop0]
@@ -17,7 +17,7 @@
 -fi
 +## Make sure a default wallpaper is set.
 +#if [ ! -e $tdehome/share/config/kdesktoprc ]; then
-+# # With Trinity KDE this file should exist, but test first.
++# # With Trinity this file should exist, but test first.
 +#  if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
 +#cat >$tdehome/share/config/kdesktoprc <<EOF
 +#[Desktop0]

debian/squeeze/tdebase/debian/rules

@@ -21,7 +21,7 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -
 
 DEB_CMAKE_EXTRA_FLAGS := -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" -DWITH_GCC_VISIBILITY="ON" \
 -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON"
+-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_UPOWER="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.

debian/squeeze/tdebase/debian/tdebase-trinity-bin.install

@@ -1,4 +1,5 @@
 debian/tmp/opt/trinity/bin/krootbacking
+debian/tmp/opt/trinity/bin/tdeinit_phase1
 debian/tmp/opt/trinity/bin/tdmtsak
 debian/tmp/opt/trinity/bin/tsak
 debian/tmp/opt/trinity/bin/kdebugdialog

debian/squeeze/tdebase/debian/twin-trinity.install

@@ -1,6 +1,7 @@
 debian/tmp/opt/trinity/bin/kompmgr
 debian/tmp/opt/trinity/bin/twin
 debian/tmp/opt/trinity/bin/twin_killer_helper
+debian/tmp/opt/trinity/bin/twin_resumer_helper
 debian/tmp/opt/trinity/bin/twin_rules_dialog
 debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules
 debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings

debian/squeeze/tdebindings/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install

@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde/kjsembed/*
+debian/tmp/opt/trinity/include/tde/kjsembed/*
 debian/tmp/opt/trinity/lib/libkjsembed.so
 debian/tmp/opt/trinity/lib/libkjsembed.la
 

debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install

@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde/smoke.h
+debian/tmp/opt/trinity/include/tde/smoke.h
 debian/tmp/opt/trinity/lib/libsmokeqt.so
 debian/tmp/opt/trinity/lib/libsmokeqt.la

debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/squeeze/tdebindings/debian/rules

@@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR)
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/tdeedu/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/tdeedu/debian/kstars-trinity.install

@@ -1,7 +1,7 @@
 etc/trinity/kstarsrc
 opt/trinity/bin/kstars
-/opt/trinity/include/kde/kstarsinterface.h
+/opt/trinity/include/tde/kstarsinterface.h
-/opt/trinity/include/kde/simclockinterface.h
+/opt/trinity/include/tde/simclockinterface.h
 /opt/trinity/share/applications/kde/kstars.desktop
 /opt/trinity/share/config.kcfg/kstars.kcfg
 /opt/trinity/share/doc/kde/HTML/en/kstars/common

debian/squeeze/tdeedu/debian/libkiten-dev-trinity.install

@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/libkiten
+/opt/trinity/include/tde/libkiten
 opt/trinity/lib/libkiten.la
 opt/trinity/lib/libkiten.so

debian/squeeze/tdeedu/debian/libtdeedu-dev-trinity.install

@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/libtdeedu
+/opt/trinity/include/tde/libtdeedu
 opt/trinity/lib/libextdate.la
 opt/trinity/lib/libextdate.so
 opt/trinity/lib/libtdeeducore.la

debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/squeeze/tdeedu/debian/rules

@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
 
 # Ensure that kig's python scripting built successfully.
 common-build-arch::

debian/squeeze/tdegames/debian/atlantik-trinity-dev.install

@@ -1,5 +1,5 @@
-/opt/trinity/include/kde/atlantik
+/opt/trinity/include/tde/atlantik
-/opt/trinity/include/kde/atlantic
+/opt/trinity/include/tde/atlantic
 /opt/trinity/lib/libatlantic.so
 /opt/trinity/lib/libatlantikclient.so
 /opt/trinity/lib/libatlantikui.so

debian/squeeze/tdegames/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/tdegames/debian/kolf-trinity-dev.install

@@ -1,2 +1,2 @@
-/opt/trinity/include/kde/kolf
+/opt/trinity/include/tde/kolf
 /opt/trinity/lib/libkolf.so

debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install

@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/*.h
+/opt/trinity/include/tde/*.h
-/opt/trinity/include/kde/kgame
+/opt/trinity/include/tde/kgame
 /opt/trinity/lib/libtdegames.so
 /opt/trinity/lib/libtdegames.la

debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff

@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"

debian/squeeze/tdegames/debian/rules

@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk
 
 export kde_bindir = /opt/trinity/games
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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

debian/squeeze/tdegraphics/debian/cdbs/kde.mk

@@ -59,7 +59,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:

debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install

@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h
+debian/tmp/opt/trinity/include/tde/poppler-link-qt3.h
-debian/tmp/opt/trinity/include/kde/poppler-page-transition.h
+debian/tmp/opt/trinity/include/tde/poppler-page-transition.h
-debian/tmp/opt/trinity/include/kde/poppler-qt.h
+debian/tmp/opt/trinity/include/tde/poppler-qt.h