merge

95 files changed, 1864 insertions, 923 deletions

diff --git a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff
index ebdf4630a..696f9093c 100644
--- a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/usr/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -14,7 +14,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
     if ! test -f $kdepotpath; then
- 	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+ 	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
     fi
diff --git a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules
index d069c6dee..e91b87b96 100755
--- a/debian/lenny/tdelibs/debian/rules
+++ b/debian/lenny/tdelibs/debian/rules
@@ -105,9 +105,9 @@ common-install-prehook-impl::
 #		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
 #	done
 
-#	msgcat --use-first kde.pot po/tdelibs.pot > tdelibs.pot-merged
+#	msgcat --use-first tde.pot po/tdelibs.pot > tdelibs.pot-merged
 #	mv -f tdelibs.pot-merged po/tdelibs.pot
-	cp -Rp kde.pot po/tdelibs.pot
+	cp -Rp tde.pot po/tdelibs.pot
 
 	# generate .po files for .desktop etc files
 	if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \
diff --git a/debian/lenny/tdelibs/debian/tdelibs14-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs14-trinity-dev.install
index 4a738709b..d4e156409 100644
--- a/debian/lenny/tdelibs/debian/tdelibs14-trinity-dev.install
+++ b/debian/lenny/tdelibs/debian/tdelibs14-trinity-dev.install
@@ -218,7 +218,7 @@ debian/tmp/opt/trinity/include/tdesensordevice.h
 debian/tmp/opt/trinity/include/tdestoragedevice.h
 debian/tmp/opt/trinity/include/tdelibs_export.h
 debian/tmp/opt/trinity/include/kdemacros.h
-debian/tmp/opt/trinity/include/kde.pot
+debian/tmp/opt/trinity/include/tde.pot
 debian/tmp/opt/trinity/include/tdeprint/driver.h
 debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
 debian/tmp/opt/trinity/include/tdeprint/kmjob.h
diff --git a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdeutils/debian/rules b/debian/lenny/tdeutils/debian/rules
index a9e44f7f8..4dbd4bf39 100755
--- a/debian/lenny/tdeutils/debian/rules
+++ b/debian/lenny/tdeutils/debian/rules
@@ -34,7 +34,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_SNMP="ON" \
  -DWITH_SENSORS="ON" \
  -DWITH_XMMS="ON" \
- -DWITH_KNEWSTUFF="ON"
+ -DWITH_TDENEWSTUFF="ON"
 
 DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity
 
diff --git a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
index 47aee4140..28c95742b 100644
--- a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/usr/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff
index ebdf4630a..696f9093c 100644
--- a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/usr/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -14,7 +14,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
     if ! test -f $kdepotpath; then
- 	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+ 	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
     fi
diff --git a/debian/squeeze/applications/kopete-otr/debian/control b/debian/squeeze/applications/kopete-otr/debian/control
index acc205091..07dfe076a 100644
--- a/debian/squeeze/applications/kopete-otr/debian/control
+++ b/debian/squeeze/applications/kopete-otr/debian/control
@@ -3,9 +3,8 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
-Homepage: http://kopete-otr.follefuder.org/
 
 Package: kopete-otr-trinity
 Architecture: any
diff --git a/debian/squeeze/applications/tde-guidance/debian/rules b/debian/squeeze/applications/tde-guidance/debian/rules
index 5046494ad..217eea9ed 100755
--- a/debian/squeeze/applications/tde-guidance/debian/rules
+++ b/debian/squeeze/applications/tde-guidance/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
 DEB_PYTHON_SYSTEM = pysupport
+PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
+GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
+export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 #include /usr/share/cdbs/1/class/python-distutils.mk
@@ -11,7 +14,7 @@ include /usr/share/cdbs/1/rules/utils.mk
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_UPDATE_RCD_PARAMS := multiuser
 DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1  debian/serviceconfig-trinity.1  debian/userconfig-trinity.1
-PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
+PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH)
 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
 
@@ -43,11 +46,11 @@ install/tde-guidance-trinity::
 
 	# fix the link properly
 	mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
-#	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
+#	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig)
 
 	# move python modules in PYSUPPORT_PATH
 	mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
@@ -87,51 +90,6 @@ install/guidance-backends-trinity::
 	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity
 	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity
 
-install/tde-guidance-powermanager-trinity::
-	# install icon to right place
-	install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
-		$(DEB_DESTDIR)/opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png
-	install -D -p -m0644 kde/powermanager/pics/*.png \
-		$(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/
-
-	# install desktop file
-	install -D -p -m0644 powermanager/guidance-power-manager.desktop \
-		$(DEB_DESTDIR)/opt/trinity/share/autostart/guidance-power-manager.desktop
-
-	# copy python modules in PYSUPPORT_PATH
-	mkdir -p $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/guidance-power-manager.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanage.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/gpmhelper.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp powermanager/guidance_power_manager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp powermanager/notify.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp powermanager/tooltip.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-
-	# generate guidance-power-manager script
-	echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
-	echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
-	chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
-
-	# fix script-not-executable
-	chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/powermanage.py
-	chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/gpmhelper.py
-
-	: # Replace all '#!' calls to python with /usr/bin/python
-	: # and make them executable
-	for i in `find debian/tde-guidance-powermanager-trinity -type f`; do \
-		sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
-			$$i > $$i.temp; \
-		if cmp --quiet $$i $$i.temp; then \
-			rm -f $$i.temp; \
-		else \
-			mv -f $$i.temp $$i; \
-			chmod 755 $$i; \
-			echo "fixed interpreter: $$i"; \
-		fi; \
-	done
-
 clean::
 	rm -rf build
 
@@ -155,9 +113,6 @@ clean::
 
 common-install-prehook-impl::
 	# generate form implementation using pytde user interface compiler
-	(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
-	(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
-	(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
 
 	mkdir -p po
 	touch list
@@ -190,4 +145,3 @@ common-install-prehook-impl::
 	fi
 
 	rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version
-	rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-powermanager-trinity/.version
diff --git a/debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install b/debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install
index 7a0a28549..fe690a9c2 100644
--- a/debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install
+++ b/debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install
@@ -1,7 +1,7 @@
-opt/trinity/lib/trinity/kcm_serviceconfig.la opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_userconfig.la opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_serviceconfig.la
+opt/trinity/lib/trinity/kcm_userconfig.la
+opt/trinity/lib/trinity/kcm_mountconfig.la
+opt/trinity/lib/trinity/kcm_wineconfig.la
 opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
@@ -57,8 +57,8 @@ opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py
 opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py
 opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py
 opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py
-opt/trinity/lib/trinity/kcm_serviceconfig.so opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_userconfig.so opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_serviceconfig.so
+opt/trinity/lib/trinity/kcm_userconfig.so
+opt/trinity/lib/trinity/kcm_mountconfig.so
+opt/trinity/lib/trinity/kcm_wineconfig.so
 usr/share/lintian/overrides/tde-guidance-trinity
diff --git a/debian/squeeze/dependencies/python-tqt/debian/rules b/debian/squeeze/dependencies/python-tqt/debian/rules
index b8b687940..2f57b4b0b 100755
--- a/debian/squeeze/dependencies/python-tqt/debian/rules
+++ b/debian/squeeze/dependencies/python-tqt/debian/rules
@@ -52,6 +52,7 @@ build-%/configure-stamp:
 	cd build-$* && echo yes \
                 | python$* ../configure.py \
                         -c -n /usr/include/tqscintilla \
+                        -e python$* \
                         -o /usr/lib -u -j $(SPLIT) \
                         -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
                         -l /usr/include/python$* \
@@ -66,6 +67,7 @@ dbg-build-%/configure-stamp:
 	cd dbg-build-$* && echo yes \
                 | python$*-dbg ../configure.py \
                         -c -n /usr/include/tqscintilla \
+                        -e python$* \
                         -o /usr/lib -u -j $(SPLIT) \
                         -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
                         -l /usr/include/python$*_d \
diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/rules b/debian/squeeze/dependencies/sip4-tqt/debian/rules
index df0c6da05..86a541601 100755
--- a/debian/squeeze/dependencies/sip4-tqt/debian/rules
+++ b/debian/squeeze/dependencies/sip4-tqt/debian/rules
@@ -41,6 +41,7 @@ build-%/configure-stamp:
 	cd build-$* \
 		&& python$* ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+			-g python$* \
 			-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
 	touch $@
 
@@ -50,6 +51,7 @@ dbg-build-%/configure-stamp:
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+			-g python$* \
 			-e /usr/include/python$*_d \
 			-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
 	touch $@
diff --git a/debian/squeeze/libraries/python-trinity/debian/rules b/debian/squeeze/libraries/python-trinity/debian/rules
index 473caac7d..ff41b19f7 100755
--- a/debian/squeeze/libraries/python-trinity/debian/rules
+++ b/debian/squeeze/libraries/python-trinity/debian/rules
@@ -48,6 +48,7 @@ build-%/configure-stamp:
 	mkdir -p build-$*
 	cd build-$* && python$* ../configure.py \
 		-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
+		-e python$* \
 		-v /opt/trinity/share/sip/trinity -j $(SPLIT)
 	touch $@
 
@@ -56,6 +57,7 @@ dbg-build-%/configure-stamp:
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* && python$*-dbg ../configure.py \
 		-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
+		-e python$* \
 		-v /opt/trinity/share/sip/trinity -j $(SPLIT)
 	touch $@
 
diff --git a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules
index 9e0cc564d..7a663d1b2 100755
--- a/debian/squeeze/tdelibs/debian/rules
+++ b/debian/squeeze/tdelibs/debian/rules
@@ -105,9 +105,9 @@ common-install-prehook-impl::
 #		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
 #	done
 
-#	msgcat --use-first kde.pot po/tdelibs.pot > tdelibs.pot-merged
+#	msgcat --use-first tde.pot po/tdelibs.pot > tdelibs.pot-merged
 #	mv -f tdelibs.pot-merged po/tdelibs.pot
-	cp -Rp kde.pot po/tdelibs.pot
+	cp -Rp tde.pot po/tdelibs.pot
 
 	# generate .po files for .desktop etc files
 	if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \
diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
index c69d5700b..21dafee6a 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
@@ -241,7 +241,7 @@ debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png
 debian/tmp/opt/trinity/share/apps/kjava/kjava.jar
 debian/tmp/opt/trinity/share/apps/kjava/kjava.policy
 debian/tmp/opt/trinity/share/apps/kjava/pluginsinfo
-debian/tmp/opt/trinity/share/apps/knewstuff/types
+debian/tmp/opt/trinity/share/apps/tdenewstuff/types
 debian/tmp/opt/trinity/share/apps/knotify/eventsrc
 debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog
 debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog.xml
diff --git a/debian/squeeze/tdelibs/debian/tdelibs14-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs14-trinity-dev.install
index 4a738709b..73c87967b 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs14-trinity-dev.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs14-trinity-dev.install
@@ -218,7 +218,7 @@ debian/tmp/opt/trinity/include/tdesensordevice.h
 debian/tmp/opt/trinity/include/tdestoragedevice.h
 debian/tmp/opt/trinity/include/tdelibs_export.h
 debian/tmp/opt/trinity/include/kdemacros.h
-debian/tmp/opt/trinity/include/kde.pot
+debian/tmp/opt/trinity/include/tde.pot
 debian/tmp/opt/trinity/include/tdeprint/driver.h
 debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
 debian/tmp/opt/trinity/include/tdeprint/kmjob.h
@@ -433,16 +433,16 @@ debian/tmp/opt/trinity/include/tdemulticastsocket.h
 debian/tmp/opt/trinity/include/tdemultipledrag.h
 debian/tmp/opt/trinity/include/tdemultitabbar.h
 debian/tmp/opt/trinity/include/knetworkinterface.h
-debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h
-debian/tmp/opt/trinity/include/knewstuff/engine.h
-debian/tmp/opt/trinity/include/knewstuff/entry.h
-debian/tmp/opt/trinity/include/knewstuff/knewstuffbutton.h
-debian/tmp/opt/trinity/include/knewstuff/knewstuffgeneric.h
-debian/tmp/opt/trinity/include/knewstuff/knewstuff.h
-debian/tmp/opt/trinity/include/knewstuff/knewstuffsecure.h
-debian/tmp/opt/trinity/include/knewstuff/providerdialog.h
-debian/tmp/opt/trinity/include/knewstuff/provider.h
-debian/tmp/opt/trinity/include/knewstuff/uploaddialog.h
+debian/tmp/opt/trinity/include/tdenewstuff/downloaddialog.h
+debian/tmp/opt/trinity/include/tdenewstuff/engine.h
+debian/tmp/opt/trinity/include/tdenewstuff/entry.h
+debian/tmp/opt/trinity/include/tdenewstuff/knewstuffbutton.h
+debian/tmp/opt/trinity/include/tdenewstuff/knewstuffgeneric.h
+debian/tmp/opt/trinity/include/tdenewstuff/knewstuff.h
+debian/tmp/opt/trinity/include/tdenewstuff/knewstuffsecure.h
+debian/tmp/opt/trinity/include/tdenewstuff/providerdialog.h
+debian/tmp/opt/trinity/include/tdenewstuff/provider.h
+debian/tmp/opt/trinity/include/tdenewstuff/uploaddialog.h
 debian/tmp/opt/trinity/include/knfsshare.h
 debian/tmp/opt/trinity/include/knotifyclient.h
 debian/tmp/opt/trinity/include/knotifydialog.h
@@ -808,8 +808,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.la
 debian/tmp/opt/trinity/lib/libtdemediaplayer.so
 debian/tmp/opt/trinity/lib/libtdemid.la
 debian/tmp/opt/trinity/lib/libtdemid.so
-debian/tmp/opt/trinity/lib/libknewstuff.la
-debian/tmp/opt/trinity/lib/libknewstuff.so
+debian/tmp/opt/trinity/lib/libtdenewstuff.la
+debian/tmp/opt/trinity/lib/libtdenewstuff.so
 debian/tmp/opt/trinity/lib/libtdentlm.la
 debian/tmp/opt/trinity/lib/libtdentlm.so
 debian/tmp/opt/trinity/lib/libtdeparts.la
diff --git a/debian/squeeze/tdelibs/debian/tdelibs14-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs14-trinity.install
index af088947e..b54ca2e2f 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs14-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs14-trinity.install
@@ -287,8 +287,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0
 debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdemid.so.0
 debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95
-debian/tmp/opt/trinity/lib/libknewstuff.so.1
-debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdenewstuff.so.1
+debian/tmp/opt/trinity/lib/libtdenewstuff.so.1.0.0
 debian/tmp/opt/trinity/lib/libtdentlm.so.0
 debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdeparts.so.2
diff --git a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdeutils/debian/rules b/debian/squeeze/tdeutils/debian/rules
index eb3386805..9617d1359 100755
--- a/debian/squeeze/tdeutils/debian/rules
+++ b/debian/squeeze/tdeutils/debian/rules
@@ -34,7 +34,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_SNMP="ON" \
  -DWITH_SENSORS="ON" \
  -DWITH_XMMS="ON" \
- -DWITH_KNEWSTUFF="ON"
+ -DWITH_TDENEWSTUFF="ON"
 
 DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity
 
diff --git a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
index 47aee4140..28c95742b 100644
--- a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/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/tde/kde.pot
++kdepotpath=/usr/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index ce1887dd1..f7ea7839f 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -100,7 +100,7 @@ tdegames:	tdebase tdemultimedia
 tdegraphics:	tdebase poppler cmake
 	$(call buildpkg,tdegraphics)
 
-tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake
+tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt
 	$(call buildpkg,tdelibs)
 
 tdemultimedia:	tdebase akode
@@ -143,7 +143,7 @@ endif
 cmake:
 # Build on CentOS only
 ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
-	$(call buildpkg,3rdparty/cmake)
+#	$(call buildpkg,3rdparty/cmake)
 endif
 
 esound:
@@ -250,6 +250,11 @@ endif
 akode:	tqtinterface
 	$(call buildpkg,extras/akode)
 
+cmake-macros: cmake
+ifneq ($(wildcard /etc/SuSE-release),)
+	$(call buildpkg,extras/trinity-cmake-macros)
+endif
+
 ### Trinity Libraries
 kipi-plugins:	tqtinterface libkipi
 	$(call buildpkg,libraries/kipi-plugins)
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index d55075ffa..cd8bb1662 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -38,6 +38,7 @@ rpmbuild -ba \
   --define "_buildrootdir ${BUILDROOTDIR}" \
   --define "_rpmdir ${RPMDIR}" \
   --define "_srcrpmdir ${SRPMDIR}" \
+  --define '_build_create_debug 1' \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
   --define "preversion ${PREVERSION}" \
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index 7af2065ec..5a8e282b8 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -6,14 +6,7 @@ PKGNAME="${1##*/}"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
 # Language package: install only French language package
-case ${PKGNAME} in
-  "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="trinity-${PKGNAME}-French";;
-  "koffice") PKGNAME="${PKGNAME}-suite";;
-  "trinity-"*) PKGNAME="${PKGNAME#trinity-}";;
-  "qt3") [ -r /etc/mandriva-release ] && PKGNAME="qt3-common";;
-  "curl") PKGNAME="trinity-libcurl";;
-  "esound") PKGNAME="esound-libs";;
-esac
+PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})"
 
 VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" trinity-${PKGNAME} 2>/dev/null)
 if [ -z "${VERSION}" ] || [[ "${VERSION}" =~ "not installed" ]]; then
diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh
index 46c664578..b414b8400 100755
--- a/redhat/build/get_latest_built_package_filename.sh
+++ b/redhat/build/get_latest_built_package_filename.sh
@@ -14,6 +14,8 @@ RPMDIR_NOARCH=${RPMDIR}/noarch
 RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}"
 
 case "${PKGNAME##*/}" in
+  "tqt3") PKGNAME="libtqt3-mt";;
+  "tqtinterface") PKGNAME="libtqt4";;
   "koffice") PKGNAME="koffice-suite";;
   "tde-i18n") PKGNAME="tde-i18n-French";;
 esac
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index f60190970..2d9309738 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -13,15 +13,21 @@ PKGCATEGORY="${1%%/*}"
 PKGNAME="${1##*/}"
 DEVEL="$2"
 
+# Some RPM packages have different name than the source tarball.
 # Language package: install only French language package
 case "${PKGNAME}" in
   "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";;
   "koffice") PKGNAME="${PKGNAME}-suite";;
+  "tqt3") PKGNAME="libtqt3-mt";;
+  "tqtinterface") PKGNAME="libtqt4";;
+  "avahi-tqt") PKGNAME="libavahi-tqt";;
+  "dbus-tqt") PKGNAME="libdbus-tqt-1";;
+  "dbus-1-tqt") PKGNAME="libdbus-1-tqt";;
 esac
 
 # Use the Trinity Prefix, or not.
 case "${PKGNAME}" in
-  "trinity-"*|"qt3"|"python-qt3"|"esound") PREFIX="";;
+  "trinity-"*|"qt3"|"python-qt3"|"esound"|"lib"*) PREFIX="";;
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   "curl") PREFIX="trinity-lib";;
   *) PREFIX="trinity-";;
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 188d7a6ed..8106ea1d6 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -1,10 +1,28 @@
+#
+# spec file for package arts
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
 %endif
 
+# TDE specific variables
 %define tde_version 14.0.0
-
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
@@ -18,13 +36,18 @@ Name:		trinity-arts
 Epoch:		1
 Version:	1.5.10
 Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the TDE sound system
 Group:		System Environment/Daemons 
-
-Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,8 +55,12 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	kcmartsrc-pulseaudio
 
+BuildRequires:	libtqt4-devel >= 1:4.2.0
+
 BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
 BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
@@ -45,8 +72,7 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	esound-devel
 
 # JACK support
-#  Not on RHEL4 !
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
 %define with_jack 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}jack-devel
@@ -75,6 +101,7 @@ BuildRequires:	libtool
 %endif
 
 # MAD support
+%ifarch i386 i486 i586 i686 x86_64
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} 
 %define with_libmad 1
 %if 0%{?mdkversion} || 0%{?mgaversion}
@@ -84,13 +111,14 @@ BuildRequires:		%{_lib}mad-devel
 BuildRequires:		libmad-devel
 %endif
 %endif
+%endif
 
 # Pulseaudio config file
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
 %define with_pulseaudio 1
 %endif
 
-Requires:		trinity-tqtinterface >= %{tde_version}
+Requires:		libtqt4 >= 1:4.2.0
 Requires:		audiofile
 
 %if "%{?tde_prefix}" == "/usr"
@@ -112,8 +140,17 @@ playing a wave file with some effects.
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
+%dir %{tde_prefix}
+%dir %{tde_bindir}
+%dir %{tde_datadir}
+%dir %{tde_datadir}/config
+%dir %{tde_datadir}/doc
+%dir %{tde_libdir}
 %dir %{tde_libdir}/mcop
 %dir %{tde_libdir}/mcop/Arts
+%dir %{tde_libdir}/pkgconfig
+%dir %{tde_includedir}
+%dir %{tde_tdeincludedir}
 %{tde_libdir}/mcop/Arts/*
 %{tde_libdir}/mcop/*.mcopclass
 %{tde_libdir}/mcop/*.mcoptype
@@ -138,14 +175,23 @@ playing a wave file with some effects.
 
 %package devel
 Group:		Development/Libraries
-Summary:	%{name} - Development files
+Summary:	aRts (analog realtime synthesizer) - the TDE sound system (Development files)
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{?tde_prefix}" == "/usr"
 Obsoletes:	arts-devel
 %endif
 
 %description devel
-Development files for %{name}
+arts (analog real-time synthesizer) is the sound system of TDE.
+
+The principle of arts is to create/process sound using small modules which do
+certain tasks. These may be create a waveform (oscillators), play samples,
+filter data, add signals, perform effects like delay/flanger/chorus, or
+output the data to the soundcard.
+
+By connecting all those small modules together, you can perform complex
+tasks like simulating a mixer, generating an instrument or things like
+playing a wave file with some effects.
 
 %files devel
 %defattr(-,root,root,-)
@@ -212,6 +258,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
@@ -236,12 +283,16 @@ fi
 %__rm -rf %{?buildroot}
 %__make install -C build DESTDIR=%{?buildroot}
 
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/doc
+
 # Installs the Pulseaudio configuration file
 %if 0%{?with_pulseaudio}
 %__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/config/kcmartsrc
 %endif
 
 
+
 %clean
 %__rm -rf %{?buildroot}
 
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 99f4c20bc..2f06c4aed 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -1,30 +1,52 @@
+#
+# spec file for package avahi-tqt
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
 # TDE specific building variables
 %define tde_version 14.0.0
-%define tde_prefix /usr
+%define tde_prefix /opt/trinity
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
-
 Name:		trinity-avahi-tqt
 Epoch:		2
 Version:	0.6.30
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Avahi TQT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
+Summary:	Avahi TQt integration library
+Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
 
-Prefix:		%{tde_prefix}
+%if 0%{?suse_version}
+License:	LGPL-2.0+
+%else
+License:	LGPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	libtqt3-mt-devel >= 3.5.0
+BuildRequires:	libtqt4-devel >= 1:4.2.0
+
 BuildRequires:	gcc-c++
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
 
@@ -39,7 +61,6 @@ BuildRequires:	dbus-devel
 # AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
-Provides:		%{_lib}avahi-qt3
 %endif
 %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
 BuildRequires:	avahi-devel
@@ -53,37 +74,94 @@ BuildRequires:	expat-devel
 BuildRequires:	libexpat-devel
 %endif
 
-Requires:		trinity-tqt3 >= 3.5.0
-Requires:		trinity-tqtinterface >= %{tde_version}
+%description
+Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+It allows programs to publish and discover services and hosts
+running on a local network with no specific configuration. For
+example you can plug into a network and instantly find printers to
+print to, files to look at and people to talk to.
+ .
+This library contains the interface to integrate the Avahi libraries
+into a TQt main loop application.
+
+##########
 
-Obsoletes:		avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+%package -n libavahi-tqt
+Summary:	Avahi TQt integration library
+Group:		System/Libraries
 
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Provides:		%{_lib}avahi-qt3
+%endif
 
-%description
-Avahi TQT Interface
+Obsoletes:		trinity-avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
+%description -n libavahi-tqt
+Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+It allows programs to publish and discover services and hosts
+running on a local network with no specific configuration. For
+example you can plug into a network and instantly find printers to
+print to, files to look at and people to talk to.
+ .
+This library contains the interface to integrate the Avahi libraries
+into a TQt main loop application.
 
-%package devel
-Summary:	%{name} - Development files
+%post -n libavahi-tqt
+/sbin/ldconfig || :
+
+%postun -n libavahi-tqt
+/sbin/ldconfig || :
+
+%files -n libavahi-tqt
+%defattr(-,root,root,-)
+%{_libdir}/libavahi-tqt.so.1
+%{_libdir}/libavahi-tqt.so.1.0.0
+
+##########
+
+%package -n libavahi-tqt-devel
+Summary:	Avahi TQt integration library (Development Files)
 Group:		Development/Libraries
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libavahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?mgaversion} || 0%{?mdkversion}
 Provides:		%{_lib}avahi-qt3-devel
 %endif
 
-Obsoletes:		avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n libavahi-tqt-devel
+Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+It allows programs to publish and discover services and hosts
+running on a local network with no specific configuration. For
+example you can plug into a network and instantly find printers to
+print to, files to look at and people to talk to.
+ .
+This library contains the interface to integrate the Avahi libraries
+into a TQt main loop application.
+
+%post -n libavahi-tqt-devel
+/sbin/ldconfig || :
+
+%postun -n libavahi-tqt-devel
+/sbin/ldconfig || :
 
-%description devel
-Development files for %{name}
+%files -n libavahi-tqt-devel
+%defattr(-,root,root,-)
+%{_includedir}/avahi-tqt/
+%{_libdir}/libavahi-tqt.so
+%{_libdir}/libavahi-tqt.la
+%{_libdir}/pkgconfig/avahi-tqt.pc
 
+##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -95,9 +173,9 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
 %configure \
-  --exec-prefix=%{tde_prefix} \
-  --includedir=%{tde_includedir} \
-  --libdir=%{tde_libdir} \
+  --exec-prefix=%{_prefix} \
+  --includedir=%{_includedir} \
+  --libdir=%{_libdir} \
   \
   --disable-static \
   --disable-dependency-tracking \
@@ -116,30 +194,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %clean
 %__rm -rf %{?buildroot}
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%defattr(-,root,root,-)
-%{tde_libdir}/libavahi-tqt.so.1
-%{tde_libdir}/libavahi-tqt.so.1.0.0
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/avahi-tqt/
-%{tde_libdir}/libavahi-tqt.so
-%{tde_libdir}/libavahi-tqt.la
-%{tde_libdir}/pkgconfig/avahi-tqt.pc
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.30-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.30-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 37bad2f72..013caed29 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -1,89 +1,129 @@
+#
+# spec file for package dbus-1-tqt
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
 # TDE specific building variables
 %define tde_version 14.0.0
-%define tde_prefix /usr
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
+
 
 Name:		trinity-dbus-1-tqt
 Epoch:		2
 Version:	0.9
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Dbus TQT Interface
-Group:		System Environment/Libraries
+Summary:	dbus bindings for the Trinity Qt [TQt] interface
+Group:		System/Libraries
 
-Obsoletes:		dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	libtqt3-mt-devel >= 3.5.0
+BuildRequires:	libtqt4-devel >= 1:4.2.0
+
 BuildRequires:	gcc-c++
+BuildRequires:	cmake >= 2.8
+
+# DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
 %else
 BuildRequires:	dbus-devel
 %endif
 
-BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-Requires:		trinity-tqt3 >= 3.5.0
+%description
 
+###########
 
-%description
-Dbus TQT Interface
+%package -n libdbus-1-tqt
+Summary:		dbus bindings for the Trinity Qt [TQt] interface
+Group:			System/Libraries
+
+Obsoletes:		trinity-dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n libdbus-1-tqt
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
+
+This package provides bindings for the Trinity Qt TQt interface.
 
-%post
+See the dbus description for more information about D-BUS in general.
+
+%post -n libdbus-1-tqt
 /sbin/ldconfig || :
 
-%postun
+%postun -n libdbus-1-tqt
 /sbin/ldconfig || :
 
-%files
+%files -n libdbus-1-tqt
 %defattr(-,root,root,-)
-%{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/libdbus-1-tqt.so.0
-%{tde_libdir}/libdbus-1-tqt.so.0.0.0
+%{_libdir}/libdbus-1-tqt.so.0
+%{_libdir}/libdbus-1-tqt.so.0.0.0
 
 ##########
 
-%package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group:		Development/Libraries
+%package -n libdbus-1-tqt-devel
+Summary:		dbus bindings for the Trinity Qt [TQt] interface (Development Files)
+Group:			Development/Libraries
+Requires:		libdbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:		trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:		dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%description -n libdbus-1-tqt-devel
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
 
-%description devel
-Development files for %{name}
+This package provides bindings for the Trinity Qt TQt interface.
 
-%post devel
+See the dbus description for more information about D-BUS in general.
+
+%post -n libdbus-1-tqt-devel
 /sbin/ldconfig || :
 
-%postun devel
+%postun -n libdbus-1-tqt-devel
 /sbin/ldconfig || :
 
-%files devel
+%files -n libdbus-1-tqt-devel
 %defattr(-,root,root,-)
-%{tde_includedir}/*.h
-%{tde_libdir}/libdbus-1-tqt.so
-%{tde_libdir}/libdbus-1-tqt.la
-%{tde_libdir}/pkgconfig/*.pc
+%{_bindir}/dbusxml2qt3
+%{_includedir}/*.h
+%{_libdir}/libdbus-1-tqt.so
+%{_libdir}/libdbus-1-tqt.la
+%{_libdir}/pkgconfig/*.pc
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -91,7 +131,7 @@ Development files for %{name}
 
 %build
 unset QTDIR QTINC QTLIB
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
 
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
@@ -106,9 +146,9 @@ fi
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBIN_INSTALL_DIR=%{_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{_includedir} \
+  -DLIB_INSTALL_DIR=%{_libdir} \
   ..
 
 %__make %{?_smp_mflags}
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 0ebea9111..63f598d8b 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -1,98 +1,128 @@
+#
+# spec file for package dbus-tqt
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
 # TDE specific building variables
 %define tde_version 14.0.0
-%define tde_prefix /usr
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
+
 
 Name:		trinity-dbus-tqt
 Epoch:		2
 Version:	0.63
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Dbus TQT Interface
-Group:		System Environment/Libraries
+Summary:	Simple inter-process messaging system
+Group:		System/Libraries
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{tde_prefix}
+Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-# [dbus-tqt] Fix build on RHEL 4
-Patch1:		dbus-tqt-3.5.13-fix_old_dbus_types.patch
+BuildRequires:	libtqt3-mt-devel >= 3.5.0
+BuildRequires:	libtqt4-devel >= 1:4.2.0
 
 BuildRequires:	gcc-c++
+BuildRequires:	cmake >= 2.8
+
+# DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
 %else
 BuildRequires:	dbus-devel
 %endif
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
 
-BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
-Requires:		trinity-tqt3 >= 3.5.0
+%description
 
-Obsoletes:		dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+##########
 
+%package -n libdbus-tqt-1
+Summary:	Simple inter-process messaging system (TQt-based shared library)
+Group:		System/Libraries
 
-%description
-Dbus TQT Interface
+Obsoletes:		trinity-dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n libdbus-tqt-1
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
+
+This package provides the TQt-based shared library for applications using the
+Qt interface to D-BUS.
+
+See the dbus description for more information about D-BUS in general.
 
-%post
+%post -n libdbus-tqt-1
 /sbin/ldconfig || :
 
-%postun
+%postun -n libdbus-tqt-1
 /sbin/ldconfig || :
 
-%files
+%files -n libdbus-tqt-1
 %defattr(-,root,root,-)
-%{tde_libdir}/libdbus-tqt-1.so.0
-%{tde_libdir}/libdbus-tqt-1.so.0.0.0
+%{_libdir}/libdbus-tqt-1.so.0
+%{_libdir}/libdbus-tqt-1.so.0.0.0
 
 ##########
 
-%package devel
-Requires:		%{name}
-Summary:		%{name} - Development files
+%package -n libdbus-tqt-1-devel
+Summary:		Simple inter-process messaging system (TQt interface)
 Group:			Development/Libraries
+Requires:		libdbus-tqt-1 = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Obsoletes:		dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description devel
+%description -n libdbus-tqt-1-devel
 Development files for %{name}
 
-%post devel
+%post -n libdbus-tqt-1-devel
 /sbin/ldconfig || :
 
-%postun devel
+%postun -n libdbus-tqt-1-devel
 /sbin/ldconfig || :
 
-%files devel
+%files -n libdbus-tqt-1-devel
 %defattr(-,root,root,-)
-%{tde_includedir}/dbus-1.0/*
-%{tde_libdir}/libdbus-tqt-1.so
-%{tde_libdir}/libdbus-tqt-1.la
-%{tde_libdir}/pkgconfig/dbus-tqt.pc
+%{_includedir}/dbus-1.0/*
+%{_libdir}/libdbus-tqt-1.so
+%{_libdir}/libdbus-tqt-1.la
+%{_libdir}/pkgconfig/dbus-tqt.pc
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .dbustypes
-%endif
-
 
 %build
 unset QTDIR QTINC QTLIB
@@ -115,8 +145,8 @@ fi
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DINCLUDE_INSTALL_DIR=%{_includedir} \
+  -DLIB_INSTALL_DIR=%{_libdir} \
   ..
 
 %__make %{?_smp_mflags}
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index c74ac86fc..3d29ee9f0 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -1,32 +1,51 @@
+#
+# spec file for package libart-lgpl
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
 %endif
 
+# TDE variables
 %define tde_version 14.0.0
-
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_datadir %{tde_prefix}/share
-
 %define tde_tdeincludedir %{tde_includedir}/tde
-
 %define _docdir %{tde_datadir}/doc
 
 
 Name:           trinity-libart-lgpl
 Version:        2.3.22
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-
 Summary:        Library of functions for 2D graphics - runtime files
-
 Group:          System Environment/Libraries
-License:        LGPLv2+
-
-Vendor:			Trinity Project
 URL:			http://www.trinitydesktop.org/
-Packager:		Francois Andriot <francois.andriot@free.fr>
+
+%if 0%{?suse_version}
+License:	LGPL-2.0+
+%else
+License:	LGPLv2+
+%endif
+
+#Vendor:			Trinity Project
+#Packager:		Francois Andriot <francois.andriot@free.fr>
 
 Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +55,8 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:  trinity-tqt3-devel >= 3.5.0
 BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
 
+BuildRequires:	gcc-c++
+
 %description
 A library of functions for 2D graphics supporting a superset of the
 PostScript imaging model, designed to be integrated with graphics, artwork,
@@ -45,10 +66,10 @@ especially suitable for embedded applications.
 
 
 %post
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %files
 %defattr(-,root,root,-)
@@ -70,10 +91,10 @@ compatible with C++. With a small footprint of 10,000 lines of code, it is
 especially suitable for embedded applications.
 
 %post devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %files devel
 %defattr(-,root,root,-)
@@ -129,7 +150,7 @@ especially suitable for embedded applications.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
diff --git a/redhat/dependencies/tqt3/assistant-tqt3.desktop b/redhat/dependencies/tqt3/assistant-tqt3.desktop
new file mode 120000
index 000000000..7cf2e4114
--- /dev/null
+++ b/redhat/dependencies/tqt3/assistant-tqt3.desktop
@@ -0,0 +1 @@
+../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
\ No newline at end of file
diff --git a/redhat/dependencies/tqt3/build-examples.sh b/redhat/dependencies/tqt3/build-examples.sh
new file mode 120000
index 000000000..f8ef0b95c
--- /dev/null
+++ b/redhat/dependencies/tqt3/build-examples.sh
@@ -0,0 +1 @@
+../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/build-examples.sh
\ No newline at end of file
diff --git a/redhat/dependencies/tqt3/designer-tqt3.desktop b/redhat/dependencies/tqt3/designer-tqt3.desktop
new file mode 120000
index 000000000..5ca95a1c4
--- /dev/null
+++ b/redhat/dependencies/tqt3/designer-tqt3.desktop
@@ -0,0 +1 @@
+../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
\ No newline at end of file
diff --git a/redhat/dependencies/tqt3/linguist-tqt3.desktop b/redhat/dependencies/tqt3/linguist-tqt3.desktop
new file mode 120000
index 000000000..7ad540738
--- /dev/null
+++ b/redhat/dependencies/tqt3/linguist-tqt3.desktop
@@ -0,0 +1 @@
+../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
\ No newline at end of file
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch b/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch
deleted file mode 100644
index beb82b4d4..000000000
--- a/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/ntqstyle.h.ORI	2014-05-04 12:49:48.579786273 -0400
-+++ trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/ntqstyle.h	2014-05-04 12:50:00.948216121 -0400
-@@ -287,6 +287,7 @@
- 		TQ_UINT32 topLevelWidgetFlags;
- 		TQPixmap paletteBgPixmap;
- 
-+/*
- #ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
- 	public:
- 		TQStyleControlElementData(const TQStyleControlElementData&);
-@@ -295,6 +296,7 @@
- 		// Disable copy constructor
- 		TQStyleControlElementData(const TQStyleControlElementData&);
- #endif // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
-+*/
- 
- };
- 
---- trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/qstyle.cpp.ORI	2014-05-04 12:50:38.499448860 -0400
-+++ trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/qstyle.cpp	2014-05-04 12:50:49.766018474 -0400
-@@ -2836,6 +2836,7 @@
- 	//
- }
- 
-+/*
- TQStyleControlElementData::TQStyleControlElementData(const TQStyleControlElementData& orig) {
- 	isNull = orig.isNull;
- 	widgetObjectTypes = orig.widgetObjectTypes;
-@@ -2898,5 +2899,6 @@
- 	topLevelWidgetFlags = orig.topLevelWidgetFlags;
- 	paletteBgPixmap = orig.paletteBgPixmap;
- }
-+*/
- 
- #endif // QT_NO_STYLE
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index e273c4006..edaed58d1 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -1,29 +1,50 @@
+#
+# spec file for package tqt3
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# TDE specific variables
 %define tde_version 14.0.0
 
-# Always install under standard prefix
-%define tde_prefix /usr
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
 
 Name:		trinity-tqt3
+Epoch:		0
 Version:	3.5.0
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary:	The shared library for the Trinity Qt 3 GUI toolkit
+Summary:	TQt GUI Library, Version 3
+Group:		System/GUI/Other
+URL:		http://www.trinitydesktop.org/
 
-License:	QPL or GPLv2 or GPLv3
-Group:		System Environment/Libraries
-BuildRoot:	%{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n)
-Url:		http://www.trinitydesktop.org
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Prefix:		%{tde_prefix}
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Prefix:		/usr
+BuildRoot:	%{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n)
 
-# [tqt3] Unexplained FTBFS on RHEL5
-Patch1:		tqt3-14.0.0-rhel5_ftbfs.patch
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	assistant-tqt3.desktop
+Source2:	designer-tqt3.desktop
+Source3:	linguist-tqt3.desktop
+Source4:	tqt3config.desktop
+Source5:	build-examples.sh
 
 Patch15:	tqt3-14.0.0-add_tqt_home_dir_variable.patch
 
@@ -42,7 +63,6 @@ BuildRequires: freetype-devel
 BuildRequires: fontconfig-devel
 BuildRequires: gcc-c++
 BuildRequires: make
-BuildRequires: desktop-file-utils
 
 # CUPS support
 BuildRequires: cups-devel
@@ -210,278 +230,902 @@ BuildRequires: util-linux
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define EXTRA_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden
 %endif 
- 
+
+%description
+
+##########
+
+%package -n libtqt3-mt
+Summary:	TQt GUI Library (Threaded runtime version), Version 3
+Group:		System/GUI/Other
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: coreutils
 Requires: fontconfig >= 2.0
 Requires: /etc/ld.so.conf.d
 
-%description
-TQt is a GUI software toolkit which simplifies the task of writing and
-maintaining GUI (Graphical User Interface) applications
-for the X Window System.
+%description -n libtqt3-mt
+This is the Trolltech TQt library, version 3. It's necessary for
+applications that link against the libtqt-mt.so.3, e.g. all Trinity
+applications.
 
-TQt is written in C++ and is fully object-oriented.
+%post -n libtqt3-mt
+/sbin/ldconfig || :
 
-This package contains the shared library needed to run TQt 3
-applications, as well as the README files for TQt 3.
+%postun -n libtqt3-mt
+/sbin/ldconfig || :
 
-%post
+%files -n libtqt3-mt
+%defattr(-,root,root,-)
+%doc FAQ LICENSE* README* changes*
+%dir %{_libdir}/tqt3/
+%dir %{_libdir}/tqt3/plugins/
+%dir %{_libdir}/tqt3/plugins/designer/
+%dir %{_libdir}/tqt3/plugins/imageformats/
+%dir %{_libdir}/tqt3/plugins/inputmethods/
+%dir %{_libdir}/tqt3/plugins/sqldrivers/
+%dir %{_datadir}/tqt3/
+%dir %{_datadir}/tqt3/doc/
+%dir %{_datadir}/tqt3/doc/html/
+%dir %{_datadir}/tqt3/mkspecs/
+%dir %{_datadir}/tqt3/phrasebooks/
+%dir %{_datadir}/tqt3/templates/
+%dir %{_datadir}/tqt3/tools/
+%dir %{_sysconfdir}/tqt3
+%{_libdir}/libtqt-mt.so.3
+%{_libdir}/libtqt-mt.so.3.5
+%{_libdir}/libtqt-mt.so.3.5.0
+%{_libdir}/libtqui.so.1
+%{_libdir}/libtqui.so.1.0
+%{_libdir}/libtqui.so.1.0.0
+%{_libdir}/tqt3/plugins/imageformats/libqmng.so
+%{_libdir}/tqt3/plugins/inputmethods/libqimsw-multi.so
+%{_libdir}/tqt3/plugins/inputmethods/libqimsw-none.so
+%{_libdir}/tqt3/plugins/inputmethods/libqsimple.so
+%{_libdir}/tqt3/plugins/inputmethods/libqxim.so
+
+###########
+
+%package -n libtqt3-mt-devel
+Summary:	TQt development files (Threaded)
+Group:		Development/Libraries
+Requires:	libtqt3-mt = %{version}-%{release}
+
+%description -n libtqt3-mt-devel
+TQt is a C++ class library optimized for graphical user interface
+development. This package contains the libtqt-mt.so symlink, necessary
+for building threaded TQt applications as well as the libtqui.so symlink
+and the necessary header files for libtqui.so. (See README.Debian and
+the TQt Documentation for instructions on libtqui.so)
+
+WARNING: If you plan to build some older TQt3 applications, you will
+most probably have to install the libtqt3-compat-headers package. It
+contains all the headers which are not part of the official TQt3 API
+anymore but which are still used by some programs. So if you encounter
+problems with missing header files, please install this package first
+before you send a bugreport.
+
+%post -n libtqt3-mt-devel
 /sbin/ldconfig || :
 
-%postun
+%postun -n libtqt3-mt-devel
 /sbin/ldconfig || :
 
-%files
+%files -n libtqt3-mt-devel
 %defattr(-,root,root,-)
-%doc FAQ LICENSE* README* changes*
-%dir %{tde_libdir}/tqt3/plugins
-%dir %{tde_libdir}/tqt3/plugins/sqldrivers
-#%dir %{tde_libdir}/tqt3/plugins/styles
-%{tde_datadir}/tqt3/translations/
-%dir %{tde_libdir}/tqt3/plugins/designer
-%{tde_libdir}/tqt3/plugins/designer/libcppeditor.so
-%{tde_libdir}/tqt3/plugins/designer/libdlgplugin.so
-%{tde_libdir}/tqt3/plugins/designer/libgladeplugin.so
-%{tde_libdir}/tqt3/plugins/designer/libkdevdlgplugin.so
-%{tde_libdir}/tqt3/plugins/designer/librcplugin.so
-%{tde_libdir}/tqt3/plugins/designer/libwizards.so
-%dir %{tde_libdir}/tqt3/plugins/imageformats
-%{tde_libdir}/tqt3/plugins/imageformats/libqmng.so
-%dir %{tde_libdir}/tqt3/plugins/inputmethods
-%{tde_libdir}/tqt3/plugins/inputmethods/libqimsw-multi.so
-%{tde_libdir}/tqt3/plugins/inputmethods/libqimsw-none.so
-%{tde_libdir}/tqt3/plugins/inputmethods/libqsimple.so
-%{tde_libdir}/tqt3/plugins/inputmethods/libqxim.so
-%{tde_libdir}/libtqt-mt.so.3
-%{tde_libdir}/libtqt-mt.so.3.5
-%{tde_libdir}/libtqt-mt.so.3.5.0
-%{tde_libdir}/libtqt-mt.la
-%{tde_libdir}/libtqui.so.1
-%{tde_libdir}/libtqui.so.1.0
-%{tde_libdir}/libtqui.so.1.0.0
-%{tde_libdir}/libtqtdesignercore.so.1
-%{tde_libdir}/libtqtdesignercore.so.1.0
-%{tde_libdir}/libtqtdesignercore.so.1.0.0
-%{tde_libdir}/libtqteditor.so.1
-%{tde_libdir}/libtqteditor.so.1.0
-%{tde_libdir}/libtqteditor.so.1.0.0
-%{tde_libdir}/libtqassistantclient.so.1
-%{tde_libdir}/libtqassistantclient.so.1.0
-%{tde_libdir}/libtqassistantclient.so.1.0.0
+%{_libdir}/libtqt-mt.la
+%{_libdir}/libtqt-mt.so
+%{_libdir}/libtqt-mt.prl
+%{_libdir}/libtqui.so
+%{_libdir}/libtqui.prl
+%{_libdir}/pkgconfig/tqt-mt.pc
+%dir %{_includedir}/tqt3
+%{_includedir}/tqt3/ntqgl.h
+%{_includedir}/tqt3/ntqglcolormap.h
+%{_includedir}/tqt3/ntqwidgetfactory.h
+%{_includedir}/tqt3/actioninterface.h
+%{_includedir}/tqt3/arghintwidget.h
+%{_includedir}/tqt3/browser.h
+%{_includedir}/tqt3/cindent.h
+%{_includedir}/tqt3/classbrowserinterface.h
+%{_includedir}/tqt3/completion.h
+%{_includedir}/tqt3/conf.h
+%{_includedir}/tqt3/designerinterface.h
+%{_includedir}/tqt3/editor.h
+%{_includedir}/tqt3/editorinterface.h
+%{_includedir}/tqt3/filterinterface.h
+%{_includedir}/tqt3/interpreterinterface.h
+%{_includedir}/tqt3/languageinterface.h
+%{_includedir}/tqt3/markerwidget.h
+%{_includedir}/tqt3/ntqabstractlayout.h
+%{_includedir}/tqt3/ntqaccel.h
+%{_includedir}/tqt3/ntqaccessible.h
+%{_includedir}/tqt3/ntqaction.h
+%{_includedir}/tqt3/ntqapplication.h
+%{_includedir}/tqt3/ntqasciicache.h
+%{_includedir}/tqt3/ntqasciidict.h
+%{_includedir}/tqt3/ntqasyncimageio.h
+%{_includedir}/tqt3/ntqasyncio.h
+%{_includedir}/tqt3/ntqbig5codec.h
+%{_includedir}/tqt3/ntqbitarray.h
+%{_includedir}/tqt3/ntqbitmap.h
+%{_includedir}/tqt3/ntqbrush.h
+%{_includedir}/tqt3/ntqbuffer.h
+%{_includedir}/tqt3/ntqbutton.h
+%{_includedir}/tqt3/ntqbuttongroup.h
+%{_includedir}/tqt3/ntqcache.h
+%{_includedir}/tqt3/ntqcanvas.h
+%{_includedir}/tqt3/ntqcdestyle.h
+%{_includedir}/tqt3/ntqcheckbox.h
+%{_includedir}/tqt3/ntqcleanuphandler.h
+%{_includedir}/tqt3/ntqclipboard.h
+%{_includedir}/tqt3/ntqcolor.h
+%{_includedir}/tqt3/ntqcolordialog.h
+%{_includedir}/tqt3/ntqcombobox.h
+%{_includedir}/tqt3/ntqcommonstyle.h
+%{_includedir}/tqt3/ntqcompactstyle.h
+%{_includedir}/tqt3/ntqconfig.h
+%{_includedir}/tqt3/ntqconnection.h
+%{_includedir}/tqt3/ntqcstring.h
+%{_includedir}/tqt3/ntqcursor.h
+%{_includedir}/tqt3/ntqdatabrowser.h
+%{_includedir}/tqt3/ntqdatastream.h
+%{_includedir}/tqt3/ntqdatatable.h
+%{_includedir}/tqt3/ntqdataview.h
+%{_includedir}/tqt3/ntqdatetime.h
+%{_includedir}/tqt3/ntqdatetimeedit.h
+%{_includedir}/tqt3/ntqdeepcopy.h
+%{_includedir}/tqt3/ntqdesktopwidget.h
+%{_includedir}/tqt3/ntqdial.h
+%{_includedir}/tqt3/ntqdialog.h
+%{_includedir}/tqt3/ntqdict.h
+%{_includedir}/tqt3/ntqdir.h
+%{_includedir}/tqt3/ntqdns.h
+%{_includedir}/tqt3/ntqdockarea.h
+%{_includedir}/tqt3/ntqdockwindow.h
+%{_includedir}/tqt3/ntqdom.h
+%{_includedir}/tqt3/ntqdragobject.h
+%{_includedir}/tqt3/ntqdrawutil.h
+%{_includedir}/tqt3/ntqdropsite.h
+%{_includedir}/tqt3/ntqeditorfactory.h
+%{_includedir}/tqt3/ntqerrormessage.h
+%{_includedir}/tqt3/ntqeucjpcodec.h
+%{_includedir}/tqt3/ntqeuckrcodec.h
+%{_includedir}/tqt3/ntqevent.h
+%{_includedir}/tqt3/ntqeventloop.h
+%{_includedir}/tqt3/ntqfeatures.h
+%{_includedir}/tqt3/ntqfile.h
+%{_includedir}/tqt3/ntqfiledialog.h
+%{_includedir}/tqt3/ntqfileinfo.h
+%{_includedir}/tqt3/ntqfocusdata.h
+%{_includedir}/tqt3/ntqfont.h
+%{_includedir}/tqt3/ntqfontdatabase.h
+%{_includedir}/tqt3/ntqfontdialog.h
+%{_includedir}/tqt3/ntqfontinfo.h
+%{_includedir}/tqt3/ntqfontmetrics.h
+%{_includedir}/tqt3/ntqframe.h
+%{_includedir}/tqt3/ntqftp.h
+%{_includedir}/tqt3/ntqgarray.h
+%{_includedir}/tqt3/ntqgb18030codec.h
+%{_includedir}/tqt3/ntqgbkcodec.h
+%{_includedir}/tqt3/ntqgcache.h
+%{_includedir}/tqt3/ntqgdict.h
+%{_includedir}/tqt3/ntqgeneric.h
+%{_includedir}/tqt3/ntqgif.h
+%{_includedir}/tqt3/ntqglist.h
+%{_includedir}/tqt3/ntqglobal.h
+%{_includedir}/tqt3/ntqgplugin.h
+%{_includedir}/tqt3/ntqgrid.h
+%{_includedir}/tqt3/ntqgridview.h
+%{_includedir}/tqt3/ntqgroupbox.h
+%{_includedir}/tqt3/ntqguardedptr.h
+%{_includedir}/tqt3/ntqgvector.h
+%{_includedir}/tqt3/ntqhbox.h
+%{_includedir}/tqt3/ntqhbuttongroup.h
+%{_includedir}/tqt3/ntqheader.h
+%{_includedir}/tqt3/ntqhgroupbox.h
+%{_includedir}/tqt3/ntqhostaddress.h
+%{_includedir}/tqt3/ntqhttp.h
+%{_includedir}/tqt3/ntqiconset.h
+%{_includedir}/tqt3/ntqiconview.h
+%{_includedir}/tqt3/ntqimage.h
+%{_includedir}/tqt3/ntqimageformatplugin.h
+%{_includedir}/tqt3/ntqinputcontext.h
+%{_includedir}/tqt3/ntqinputcontextfactory.h
+%{_includedir}/tqt3/ntqinputcontextplugin.h
+%{_includedir}/tqt3/ntqinputdialog.h
+%{_includedir}/tqt3/ntqintcache.h
+%{_includedir}/tqt3/ntqintdict.h
+%{_includedir}/tqt3/ntqinterlacestyle.h
+%{_includedir}/tqt3/ntqiodevice.h
+%{_includedir}/tqt3/ntqjiscodec.h
+%{_includedir}/tqt3/ntqjpegio.h
+%{_includedir}/tqt3/ntqjpunicode.h
+%{_includedir}/tqt3/ntqkeycode.h
+%{_includedir}/tqt3/ntqkeysequence.h
+%{_includedir}/tqt3/ntqlabel.h
+%{_includedir}/tqt3/ntqlayout.h
+%{_includedir}/tqt3/ntqlcdnumber.h
+%{_includedir}/tqt3/ntqlibrary.h
+%{_includedir}/tqt3/ntqlineedit.h
+%{_includedir}/tqt3/ntqlistbox.h
+%{_includedir}/tqt3/ntqlistview.h
+%{_includedir}/tqt3/ntqlocale.h
+%{_includedir}/tqt3/ntqlocalfs.h
+%{_includedir}/tqt3/ntqmainwindow.h
+%{_includedir}/tqt3/ntqmap.h
+%{_includedir}/tqt3/ntqmemarray.h
+%{_includedir}/tqt3/ntqmenubar.h
+%{_includedir}/tqt3/ntqmenudata.h
+%{_includedir}/tqt3/ntqmessagebox.h
+%{_includedir}/tqt3/ntqmetaobject.h
+%{_includedir}/tqt3/ntqmime.h
+%{_includedir}/tqt3/ntqmngio.h
+%{_includedir}/tqt3/ntqmodules.h
+%{_includedir}/tqt3/ntqmotifplusstyle.h
+%{_includedir}/tqt3/ntqmotifstyle.h
+%{_includedir}/tqt3/ntqmovie.h
+%{_includedir}/tqt3/ntqmultilineedit.h
+%{_includedir}/tqt3/ntqmutex.h
+%{_includedir}/tqt3/ntqnamespace.h
+%{_includedir}/tqt3/ntqnetwork.h
+%{_includedir}/tqt3/ntqnetworkprotocol.h
+%{_includedir}/tqt3/ntqnp.h
+%{_includedir}/tqt3/ntqobject.h
+%{_includedir}/tqt3/ntqobjectcleanuphandler.h
+%{_includedir}/tqt3/ntqobjectdefs.h
+%{_includedir}/tqt3/ntqobjectdict.h
+%{_includedir}/tqt3/ntqobjectlist.h
+%{_includedir}/tqt3/ntqpaintdevice.h
+%{_includedir}/tqt3/ntqpaintdevicedefs.h
+%{_includedir}/tqt3/ntqpaintdevicemetrics.h
+%{_includedir}/tqt3/ntqpainter.h
+%{_includedir}/tqt3/ntqpair.h
+%{_includedir}/tqt3/ntqpalette.h
+%{_includedir}/tqt3/ntqpen.h
+%{_includedir}/tqt3/ntqpicture.h
+%{_includedir}/tqt3/ntqpixmap.h
+%{_includedir}/tqt3/ntqpixmapcache.h
+%{_includedir}/tqt3/ntqplatinumstyle.h
+%{_includedir}/tqt3/ntqpngio.h
+%{_includedir}/tqt3/ntqpoint.h
+%{_includedir}/tqt3/ntqpointarray.h
+%{_includedir}/tqt3/ntqpolygonscanner.h
+%{_includedir}/tqt3/ntqpopupmenu.h
+%{_includedir}/tqt3/ntqprintdialog.h
+%{_includedir}/tqt3/ntqprinter.h
+%{_includedir}/tqt3/ntqprocess.h
+%{_includedir}/tqt3/ntqprogressbar.h
+%{_includedir}/tqt3/ntqprogressdialog.h
+%{_includedir}/tqt3/ntqptrcollection.h
+%{_includedir}/tqt3/ntqptrdict.h
+%{_includedir}/tqt3/ntqptrlist.h
+%{_includedir}/tqt3/ntqptrqueue.h
+%{_includedir}/tqt3/ntqptrstack.h
+%{_includedir}/tqt3/ntqptrvector.h
+%{_includedir}/tqt3/ntqpushbutton.h
+%{_includedir}/tqt3/ntqradiobutton.h
+%{_includedir}/tqt3/ntqrangecontrol.h
+%{_includedir}/tqt3/ntqrect.h
+%{_includedir}/tqt3/ntqregexp.h
+%{_includedir}/tqt3/ntqregion.h
+%{_includedir}/tqt3/ntqrtlcodec.h
+%{_includedir}/tqt3/ntqscrollbar.h
+%{_includedir}/tqt3/ntqscrollview.h
+%{_includedir}/tqt3/ntqsemaphore.h
+%{_includedir}/tqt3/ntqsemimodal.h
+%{_includedir}/tqt3/ntqserversocket.h
+%{_includedir}/tqt3/ntqsession.h
+%{_includedir}/tqt3/ntqsessionmanager.h
+%{_includedir}/tqt3/ntqsettings.h
+%{_includedir}/tqt3/ntqsgistyle.h
+%{_includedir}/tqt3/ntqshared.h
+%{_includedir}/tqt3/ntqsignal.h
+%{_includedir}/tqt3/ntqsignalmapper.h
+%{_includedir}/tqt3/ntqsignalslotimp.h
+%{_includedir}/tqt3/ntqsimplerichtext.h
+%{_includedir}/tqt3/ntqsize.h
+%{_includedir}/tqt3/ntqsizegrip.h
+%{_includedir}/tqt3/ntqsizepolicy.h
+%{_includedir}/tqt3/ntqsjiscodec.h
+%{_includedir}/tqt3/ntqslider.h
+%{_includedir}/tqt3/ntqsocket.h
+%{_includedir}/tqt3/ntqsocketdevice.h
+%{_includedir}/tqt3/ntqsocketnotifier.h
+%{_includedir}/tqt3/ntqsortedlist.h
+%{_includedir}/tqt3/ntqsound.h
+%{_includedir}/tqt3/ntqspinbox.h
+%{_includedir}/tqt3/ntqsplashscreen.h
+%{_includedir}/tqt3/ntqsplitter.h
+%{_includedir}/tqt3/ntqsql.h
+%{_includedir}/tqt3/ntqsqlcursor.h
+%{_includedir}/tqt3/ntqsqldatabase.h
+%{_includedir}/tqt3/ntqsqldriver.h
+%{_includedir}/tqt3/ntqsqldriverplugin.h
+%{_includedir}/tqt3/ntqsqleditorfactory.h
+%{_includedir}/tqt3/ntqsqlerror.h
+%{_includedir}/tqt3/ntqsqlfield.h
+%{_includedir}/tqt3/ntqsqlform.h
+%{_includedir}/tqt3/ntqsqlindex.h
+%{_includedir}/tqt3/ntqsqlpropertymap.h
+%{_includedir}/tqt3/ntqsqlquery.h
+%{_includedir}/tqt3/ntqsqlrecord.h
+%{_includedir}/tqt3/ntqsqlresult.h
+%{_includedir}/tqt3/ntqsqlselectcursor.h
+%{_includedir}/tqt3/ntqstatusbar.h
+%{_includedir}/tqt3/ntqstring.h
+%{_includedir}/tqt3/ntqstringlist.h
+%{_includedir}/tqt3/ntqstrlist.h
+%{_includedir}/tqt3/ntqstrvec.h
+%{_includedir}/tqt3/ntqstyle.h
+%{_includedir}/tqt3/ntqstylefactory.h
+%{_includedir}/tqt3/ntqstyleplugin.h
+%{_includedir}/tqt3/ntqstylesheet.h
+%{_includedir}/tqt3/ntqsyntaxhighlighter.h
+%{_includedir}/tqt3/ntqt.h
+%{_includedir}/tqt3/ntqtabbar.h
+%{_includedir}/tqt3/ntqtabdialog.h
+%{_includedir}/tqt3/ntqtable.h
+%{_includedir}/tqt3/ntqtabwidget.h
+%{_includedir}/tqt3/ntqtextbrowser.h
+%{_includedir}/tqt3/ntqtextcodec.h
+%{_includedir}/tqt3/ntqtextcodecfactory.h
+%{_includedir}/tqt3/ntqtextcodecplugin.h
+%{_includedir}/tqt3/ntqtextedit.h
+%{_includedir}/tqt3/ntqtextstream.h
+%{_includedir}/tqt3/ntqtextview.h
+%{_includedir}/tqt3/ntqthread.h
+%{_includedir}/tqt3/ntqthreadstorage.h
+%{_includedir}/tqt3/ntqtimer.h
+%{_includedir}/tqt3/ntqtl.h
+%{_includedir}/tqt3/ntqtoolbar.h
+%{_includedir}/tqt3/ntqtoolbox.h
+%{_includedir}/tqt3/ntqtoolbutton.h
+%{_includedir}/tqt3/ntqtooltip.h
+%{_includedir}/tqt3/ntqtranslator.h
+%{_includedir}/tqt3/ntqtsciicodec.h
+%{_includedir}/tqt3/ntqurl.h
+%{_includedir}/tqt3/ntqurlinfo.h
+%{_includedir}/tqt3/ntqurloperator.h
+%{_includedir}/tqt3/ntqutfcodec.h
+%{_includedir}/tqt3/ntquuid.h
+%{_includedir}/tqt3/ntqvalidator.h
+%{_includedir}/tqt3/ntqvaluelist.h
+%{_includedir}/tqt3/ntqvaluestack.h
+%{_includedir}/tqt3/ntqvaluevector.h
+%{_includedir}/tqt3/ntqvariant.h
+%{_includedir}/tqt3/ntqvbox.h
+%{_includedir}/tqt3/ntqvbuttongroup.h
+%{_includedir}/tqt3/ntqvfbhdr.h
+%{_includedir}/tqt3/ntqvgroupbox.h
+%{_includedir}/tqt3/ntqwaitcondition.h
+%{_includedir}/tqt3/ntqwhatsthis.h
+%{_includedir}/tqt3/ntqwidget.h
+%{_includedir}/tqt3/ntqwidgetintdict.h
+%{_includedir}/tqt3/ntqwidgetlist.h
+%{_includedir}/tqt3/ntqwidgetplugin.h
+%{_includedir}/tqt3/ntqwidgetstack.h
+%{_includedir}/tqt3/ntqwindowdefs.h
+%{_includedir}/tqt3/ntqwindowsstyle.h
+%{_includedir}/tqt3/ntqwinexport.h
+%{_includedir}/tqt3/ntqwizard.h
+%{_includedir}/tqt3/ntqwmatrix.h
+%{_includedir}/tqt3/ntqworkspace.h
+%{_includedir}/tqt3/ntqxml.h
+%{_includedir}/tqt3/paragdata.h
+%{_includedir}/tqt3/parenmatcher.h
+%{_includedir}/tqt3/preferenceinterface.h
+%{_includedir}/tqt3/preferences.h
+%{_includedir}/tqt3/preferences.ui.h
+%{_includedir}/tqt3/projectsettingsiface.h
+%{_includedir}/tqt3/qconfig-dist.h
+%{_includedir}/tqt3/qconfig-large.h
+%{_includedir}/tqt3/qconfig-medium.h
+%{_includedir}/tqt3/qconfig-minimal.h
+%{_includedir}/tqt3/qconfig-small.h
+%{_includedir}/tqt3/qsql_ibase.h
+%{_includedir}/tqt3/qsql_mysql.h
+%{_includedir}/tqt3/qsql_odbc.h
+%{_includedir}/tqt3/qsql_psql.h
+%{_includedir}/tqt3/qsql_sqlite.h
+%{_includedir}/tqt3/qsqlcachedresult.h
+%{_includedir}/tqt3/qt_pch.h
+%{_includedir}/tqt3/qtmultilineedit.h
+%{_includedir}/tqt3/qttableview.h
+%{_includedir}/tqt3/qwindow.h
+%{_includedir}/tqt3/sourcetemplateiface.h
+%{_includedir}/tqt3/templatewizardiface.h
+%{_includedir}/tqt3/viewmanager.h
+%{_includedir}/tqt3/widgetinterface.h
+
+%dir %{_includedir}/tqt3/private/
+%{_includedir}/tqt3/private/*.h
 
 ##########
 
-%package config
-Summary: Graphical configuration tool for programs using TQt 3
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
+%package -n libtqt3-mt-mysql
+Summary:	MySQL database driver for TQt3 (Threaded)
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
+
+%description -n libtqt3-mt-mysql
+This package contains the threaded MySQL plugin for TQt3. Install it if
+you intend to use or write TQt programs that are to access a MySQL DB.
 
-%description config
-TQt is a GUI software toolkit which simplifies the task of writing and
-maintaining GUI (Graphical User Interface) applications
-for the X Window System.
+%files -n libtqt3-mt-mysql
+%defattr(-,root,root,-)
+%{_libdir}/tqt3/plugins/sqldrivers/libqsqlmysql.so
+
+##########
 
-TQt is written in C++ and is fully object-oriented.
+%package -n libtqt3-mt-odbc
+Summary:	ODBC database driver for TQt3 (Threaded)
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
 
-This package contains a graphical configuration tool for programs using TQt 3.
+%description -n libtqt3-mt-odbc
+This package contains the threaded ODBC plugin for TQt3. Install it if
+you intend to use or write TQt programs that are to access an ODBC DB.
 
-%files config
+%files -n libtqt3-mt-odbc
 %defattr(-,root,root,-)
-%{tde_bindir}/tqtconfig
+%{_libdir}/tqt3/plugins/sqldrivers/libqsqlodbc.so
 
 ##########
 
-%package devel
-Summary: Development files for the TQt 3 GUI toolkit
-Group: Development/Libraries
+%package -n libtqt3-mt-psql
+Summary:	PostgreSQL database driver for TQt3 (Threaded)
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
 
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-designer = %{version}-%{release}
+%description -n libtqt3-mt-psql
+This package contains the threaded PostgreSQL plugin for TQt3.
+Install it if you intend to use or write TQt programs that are
+to access a PostgreSQL DB.
 
-%description devel
-The %{name}-devel package contains the files necessary to develop
-applications using the TQt GUI toolkit: the header files, the TQt meta
-object compiler.
+%files -n libtqt3-mt-psql
+%defattr(-,root,root,-)
+%{_libdir}/tqt3/plugins/sqldrivers/libqsqlpsql.so
 
-Install %{name}-devel if you want to develop GUI applications using the TQt 3
-toolkit.
+##########
 
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/tqtconv2ui
-%{tde_bindir}/tqvfb
-%{tde_bindir}/tqmoc
-%{tde_bindir}/tquic
-%{tde_bindir}/tqtfindtr
-%{tde_bindir}/tqt20fix
-%{tde_bindir}/tqtrename140
-%{tde_bindir}/tqassistant
-%{tde_bindir}/tqm2ts
-%{tde_bindir}/tqmake
-%{tde_bindir}/tqembed
-%{tde_bindir}/tqlinguist
-%{tde_bindir}/tqlupdate
-%{tde_bindir}/tqlrelease
-%{tde_bindir}/tqtcreatecw
-%{tde_bindir}/maketqpf
-%{tde_bindir}/tqtmergetr
-%{tde_bindir}/msg2tqm
-%{tde_datadir}/tqt3/mkspecs/
-%{tde_datadir}/tqt3/phrasebooks/
-%{tde_includedir}/tqt3/
-%{tde_libdir}/libtqtdesignercore.prl
-%{tde_libdir}/libtqtdesignercore.so
-%{tde_libdir}/libtqteditor.prl
-%{tde_libdir}/libtqteditor.so
-%{tde_libdir}/libtqassistantclient.prl
-%{tde_libdir}/libtqassistantclient.so
-%{tde_libdir}/libtqt-mt.so
-%{tde_libdir}/libtqt-mt.prl
-%{tde_libdir}/libtqui.so
-%{tde_libdir}/libtqui.prl
-%{tde_libdir}/pkgconfig/tqt-mt.pc
-
-
-%post devel
-/sbin/ldconfig || :
+%if 0%{?with_ibase}
+%package -n libtqt3-mt-ibase
+Summary:	InterBase/FireBird database driver for TQt3 (Threaded)
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
 
-%postun devel
-/sbin/ldconfig || :
+%description -n libtqt3-mt-ibase
+This package contains the threaded InterBase/FireBird plugin
+for TQt3. Install it if you intend to use or write TQt programs
+that are to access an InterBase/FireBird DB.
+
+%files -n libtqt3-mt-ibase
+%defattr(-,root,root,-)
+%{_libdir}/tqt3/plugins/sqldrivers/libqsqlibase.so
+%endif
 
 ##########
 
-%package devel-docs
-Summary: Documentation for the TQt 3 GUI toolkit
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+%package -n libtqt3-mt-sqlite
+Summary:	SQLite database driver for TQt3 (Threaded)
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
 
-%description devel-docs
-The %{name}-devel-docs package contains the man pages, the HTML documentation and
-example programs for TQt 3.
+%description -n libtqt3-mt-sqlite
+This package contains the threaded SQLite plugin for TQt3. Install
+it if you intend to use or write TQt programs that are to access an
+SQLite DB.
 
-%files devel-docs
+%files -n libtqt3-mt-sqlite
 %defattr(-,root,root,-)
-%doc examples
-%doc tutorial
-%{tde_datadir}/tqt3/doc/html/
+%{_libdir}/tqt3/plugins/sqldrivers/libqsqlite.so
 
 ##########
 
-%package ODBC
-Summary: ODBC drivers for TQt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+%package -n libtqt3-mt-sqlite3
+Summary:	SQLite3 database driver for TQt3 (Threaded)
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
+
+%description -n libtqt3-mt-sqlite3
+This package contains the threaded SQLite3 plugin for TQt3. Install
+it if you intend to use or write TQt programs that are to access an
+SQLite3 DB.
+
+%files -n libtqt3-mt-sqlite3
+%defattr(-,root,root,-)
+%{_libdir}/tqt3/plugins/sqldrivers/libqsqlite3.so
+
+###########
 
-%description ODBC
-ODBC driver for TQt 3's SQL classes (QSQL)
+%package -n libtqt3-compat-headers
+Summary:	TQt 1.x and 2.x compatibility includes
+Group:		Development/Libraries
+Requires:	libtqt3-mt = %{version}-%{release}
 
-%files ODBC
+%description -n libtqt3-compat-headers
+This package contains header files that are intended for build
+compatibility for applications that build with TQt3 but still use
+deprecated includes. It is meant as an intermediate solution and
+these header files are not part of the official TQt3 API.
+All sourcecode that is still using the headers of this package is
+subject to be changed to use the new header files which are in
+libtqt3-headers.
+
+%files -n libtqt3-compat-headers
+%defattr(-,root,root,-)
+%{_includedir}/tqt3/ntq1xcompatibility.h
+%{_includedir}/tqt3/ntqapp.h
+%{_includedir}/tqt3/ntqarray.h
+%{_includedir}/tqt3/ntqbitarry.h
+%{_includedir}/tqt3/ntqbttngrp.h
+%{_includedir}/tqt3/ntqchkbox.h
+%{_includedir}/tqt3/ntqclipbrd.h
+%{_includedir}/tqt3/ntqcollect.h
+%{_includedir}/tqt3/ntqcollection.h
+%{_includedir}/tqt3/ntqcombo.h
+%{_includedir}/tqt3/ntqconnect.h
+%{_includedir}/tqt3/ntqdatetm.h
+%{_includedir}/tqt3/ntqdrawutl.h
+%{_includedir}/tqt3/ntqdstream.h
+%{_includedir}/tqt3/ntqfiledef.h
+%{_includedir}/tqt3/ntqfiledlg.h
+%{_includedir}/tqt3/ntqfileinf.h
+%{_includedir}/tqt3/ntqfontinf.h
+%{_includedir}/tqt3/ntqfontmet.h
+%{_includedir}/tqt3/ntqgrpbox.h
+%{_includedir}/tqt3/ntqintcach.h
+%{_includedir}/tqt3/ntqiodev.h
+%{_includedir}/tqt3/ntqlcdnum.h
+%{_includedir}/tqt3/ntqlined.h
+%{_includedir}/tqt3/ntqlist.h
+%{_includedir}/tqt3/ntqmenudta.h
+%{_includedir}/tqt3/ntqmetaobj.h
+%{_includedir}/tqt3/ntqmlined.h
+%{_includedir}/tqt3/ntqmsgbox.h
+%{_includedir}/tqt3/ntqmultilinedit.h
+%{_includedir}/tqt3/ntqobjcoll.h
+%{_includedir}/tqt3/ntqobjdefs.h
+%{_includedir}/tqt3/ntqpaintd.h
+%{_includedir}/tqt3/ntqpaintdc.h
+%{_includedir}/tqt3/ntqpdevmet.h
+%{_includedir}/tqt3/ntqpmcache.h
+%{_includedir}/tqt3/ntqpntarry.h
+%{_includedir}/tqt3/ntqpopmenu.h
+%{_includedir}/tqt3/ntqprndlg.h
+%{_includedir}/tqt3/ntqprogbar.h
+%{_includedir}/tqt3/ntqprogdlg.h
+%{_includedir}/tqt3/ntqpsprn.h
+%{_includedir}/tqt3/ntqpushbt.h
+%{_includedir}/tqt3/ntqqueue.h
+%{_includedir}/tqt3/ntqradiobt.h
+%{_includedir}/tqt3/ntqrangect.h
+%{_includedir}/tqt3/ntqscrbar.h
+%{_includedir}/tqt3/ntqsocknot.h
+%{_includedir}/tqt3/ntqstack.h
+%{_includedir}/tqt3/ntqtabdlg.h
+%{_includedir}/tqt3/ntqtstream.h
+%{_includedir}/tqt3/ntqvector.h
+%{_includedir}/tqt3/ntqwidcoll.h
+%{_includedir}/tqt3/ntqwindefs.h
+%dir %{_docdir}/libtqt3-compat-headers
+%{_docdir}/libtqt3-compat-headers/attic.tar.gz
+
+###########
+
+%package -n tqt3-dev-tools
+Summary:	TQt3 development tools
+Group:		Development/Libraries
+Requires:	libtqt3-mt = %{version}-%{release}
+
+%description -n tqt3-dev-tools
+This package contains all tools that are necessary to build programs
+that are written using TQt3. These are: qmake, uic and moc.
+For TQt3 development, you most likely want to install this package.
+
+%files -n tqt3-dev-tools
 %defattr(-,root,root,-)
-%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlodbc.so
+%{_datadir}/tqt3/mkspecs/*
+%{_datadir}/tqt3/doc/html/qmake*html
+%{_datadir}/tqt3/doc/html/qmake*dcf
+%{_bindir}/tqmake
+%{_bindir}/tqlupdate
+%{_bindir}/tqlrelease
+%{_bindir}/tquic
+%{_bindir}/tqmoc
+%{_bindir}/tqembed
+%{_mandir}/man1/lrelease-tqt3.1*
+%{_mandir}/man1/lupdate-tqt3.1.gz
+%{_mandir}/man1/moc-tqt3.1*
+%{_mandir}/man1/uic-tqt3.1*
 
 ##########
 
-%package MySQL
-Summary: MySQL drivers for TQt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+%package -n tqt3-designer
+Summary:	TQt3 Designer
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
+
+%description -n tqt3-designer
+The TQt Designer is a GUI design program that interactively lets you
+construct user interfaces for the TQt library. Additionally it lets you
+create whole project and works together with the database drivers
+provided by TQt to create applications with easy database access through
+TQt. The resulting user interface files can then be converted to
+C++ classes using the uic commandline utility which is usually done
+automatically for the developer with a project management with qmake
+or automake.
+
+%files -n tqt3-designer
+%defattr(-,root,root,-)
+%{_bindir}/tqdesigner
+%{_bindir}/tqtcreatecw
+%{_bindir}/tqtconv2ui
+%{_datadir}/tqt3/doc/html/designer*html
+%{_datadir}/tqt3/doc/html/designer*dcf
+%{_datadir}/tqt3/doc/html/designer*jpg
+%{_datadir}/tqt3/templates/*
+%{_libdir}/tqt3/plugins/designer/libcppeditor.so
+%{_libdir}/tqt3/plugins/designer/libdlgplugin.so
+%{_libdir}/tqt3/plugins/designer/libgladeplugin.so
+%{_libdir}/tqt3/plugins/designer/libkdevdlgplugin.so
+%{_libdir}/tqt3/plugins/designer/librcplugin.so
+%{_libdir}/tqt3/plugins/designer/libwizards.so
+#%{_datadir}/applications/designer-tqt3.desktop
+%dir %{_datadir}/tqt3/tools/tqtconv2ui
+%{_datadir}/tqt3/tools/tqtconv2ui/main.cpp
+%{_datadir}/tqt3/tools/tqtconv2ui/tqtconv2ui.pro
+%dir %{_datadir}/tqt3/tools/tqtcreatecw
+%{_datadir}/tqt3/tools/tqtcreatecw/README
+%{_datadir}/tqt3/tools/tqtcreatecw/main.cpp
+%{_datadir}/tqt3/tools/tqtcreatecw/tqtcreatecw.pro
+
+
+###########
+
+%package -n tqt3-apps-devel
+Summary:	TQt3 Developer applications development files
+Group:		Development/Libraries
+Requires:	libtqt3-mt = %{version}-%{release}
+Requires:	libtqt3-mt-devel = %{version}-%{release}
+
+%description -n tqt3-apps-devel
+This package is intended for developers who want to develop applications
+using the additional static libraries that ship with the applications
+included with TQt; the TQt Designer and the TQt Assistant.
+It allows integrating additional enhancements into the TQt Designer
+respectively faciliate the TQt Assistant from within your TQt application
+to interactively call the Assistant for displaying online help that the
+developer includes with his application.
+
+%post -n tqt3-apps-devel
+/sbin/ldconfig || :
 
-%description MySQL
-MySQL driver for TQt 3's SQL classes (QSQL)
+%postun -n tqt3-apps-devel
+/sbin/ldconfig || :
 
-%files MySQL
+%files -n tqt3-apps-devel
 %defattr(-,root,root,-)
-%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlmysql.so
+%{_libdir}/libtqtdesignercore.prl
+%{_libdir}/libtqtdesignercore.so
+%{_libdir}/libtqtdesignercore.so.1
+%{_libdir}/libtqtdesignercore.so.1.0
+%{_libdir}/libtqtdesignercore.so.1.0.0
+%{_libdir}/libtqteditor.prl
+%{_libdir}/libtqteditor.so
+%{_libdir}/libtqteditor.so.1
+%{_libdir}/libtqteditor.so.1.0
+%{_libdir}/libtqteditor.so.1.0.0
+%{_libdir}/libtqassistantclient.prl
+%{_libdir}/libtqassistantclient.so
+%{_libdir}/libtqassistantclient.so.1
+%{_libdir}/libtqassistantclient.so.1.0
+%{_libdir}/libtqassistantclient.so.1.0.0
+%{_includedir}/tqt3/ntqassistantclient.h
 
 ##########
 
-%package PostgreSQL
-Summary: PostgreSQL drivers for TQt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+%package -n tqt3-linguist
+Summary:	The TQt3 Linguist
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
 
-%description PostgreSQL
-PostgreSQL driver for TQt 3's SQL classes (QSQL)
+%description -n tqt3-linguist
+This package contains the TQt3 Linguist which provides translators a
+tool perfect for translating any TQt-based application into other
+languages and can be used and installed independently of any TQt
+development files by the translator.
 
-%files PostgreSQL
+%files -n tqt3-linguist
 %defattr(-,root,root,-)
-%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlpsql.so
+%{_bindir}/tqlinguist
+%{_datadir}/tqt3/phrasebooks/*
+%{_datadir}/tqt3/doc/html/linguist*html
+%{_datadir}/tqt3/doc/html/linguist*dcf
+#%{_datadir}/applications/linguist-tqt3.desktop
+%dir %{_docdir}/tqt3-linguist
+%{_docdir}/tqt3-linguist/qt_untranslated.ts
 
 ##########
 
-%package sqlite
-Summary: sqlite drivers for TQt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+%package -n tqt3-assistant
+Summary:	The TQt3 assistant application
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
+
+%description -n tqt3-assistant
+This package contains the TQt3 Assistant, an easy to use frontend for
+the complete TQt3 documentation and serves as an online help viewer for
+any TQt program that wants to give the usesr access to online help.
+Within the TQt tools it is used as the help viewer for the online help
+for the TQt3 Designer and Linguist as well as qmake and the TQt 3 API
+documentation.
+
+Developers of TQt Application who want to faciliate the TQt Assistant for online
+help display should refer to the README.Debian file for libtqt3-mt-devel and
+the package tqt3-apps-devel.
+
+%files -n tqt3-assistant
+%{_bindir}/tqassistant
+#%{_datadir}/applications/assistant-tqt3.desktop
+%{_datadir}/tqt3/doc/html/assistant*html
+%{_datadir}/tqt3/doc/html/assistant*dcf
 
-%description sqlite
-sqlite driver for TQt 3's SQL classes (QSQL)
+##########
+
+%package -n tqt3-qtconfig
+Summary:	The TQt3 Configuration Application
+Group:		Development/Libraries
+Requires:	libtqt3-mt = %{version}-%{release}
+
+%description -n tqt3-qtconfig
+The TQt Configuration program allows endusers to configure the look
+and behavior of any TQt3 application. It is mostly only necessary
+on systems which don't run TDE because the Trinity control center already
+covers this configuration automatically for the users TQt3 applications
+according to his desktop settings in TDE. However, if you need to run
+CJK-fonts or other non-latin scripts, you will most likely want to
+install this package.
+
+%files -n tqt3-qtconfig
+%defattr(-,root,root,-)
+%{_bindir}/tqtconfig
+#%{_datadir}/applications/tqt3config.desktop
+
+###########
 
-%files sqlite
+%package -n tqt3-dev-tools-embedded
+Summary:	Tools to develop embedded TQt applications
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
+
+%description -n tqt3-dev-tools-embedded
+This package contains applications only suitable for developing
+applications with TQt Embedded and/or Qtopia. It provides the QVFB
+program for simulating an embedded device desktop as well as maketqpf
+for converting fonts to embedded fonts suitable for being utilized
+by TQt Embedded applications.
+
+%files -n tqt3-dev-tools-embedded
+%defattr(-,root,root,-)
+%{_bindir}/maketqpf
+%{_bindir}/tqvfb
+%dir %{_sysconfdir}/tqt3/tqvfb
+%{_sysconfdir}/tqt3/tqvfb/pda.skin
+%dir %{_datadir}/tqvfb
+%{_datadir}/tqvfb/pda_down.png
+%{_datadir}/tqvfb/pda_up.png
+
+###########
+
+%package -n tqt3-dev-tools-compat
+Summary:	Conversion utilities for TQt3 development
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
+
+%description -n tqt3-dev-tools-compat
+This package contains some older TQt tools (namely tqt20fix tqtrename140,
+tqm2ts, tqtmergetr, tqtfindtr and msg2tqm). These tools are needed only by
+application developers who need to migrate any TQt application written
+for TQt 1.x or 2.x over to TQt 3.x. The purpose of the tools are to
+help fixing the changes with include file renaming as well as migrating
+the message file format of TQt 2 translation files or any gettext-based
+translation system to the TQt 3 system.
+
+%files -n tqt3-dev-tools-compat
 %defattr(-,root,root,-)
-%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlite.so
+%{_bindir}/tqt20fix
+%{_bindir}/tqtrename140
+%{_bindir}/tqm2ts
+%{_bindir}/tqtmergetr
+%{_bindir}/tqtfindtr
+%{_bindir}/msg2tqm
 
 ##########
 
-%package sqlite3
-Summary: sqlite3 drivers for TQt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+%package -n libtqt3-i18n
+Summary:	i18n files for TQt3 library
+Group:		System/GUI/Other
+Requires:	libtqt3-mt = %{version}-%{release}
 
-%description sqlite3
-sqlite3 driver for TQt 3's SQL classes (QSQL)
+%description -n libtqt3-i18n
+This package contains the internationalization files for the TQt library.
+TQt applications that are internationalized will need to depend on this package
+for full internationalization support of the application towards the end user.
 
-%files sqlite3
+%files -n libtqt3-i18n
 %defattr(-,root,root,-)
-%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlite3.so
+%dir %{_datadir}/tqt3/translations/
+%{_datadir}/tqt3/translations/assistant_de.qm
+%{_datadir}/tqt3/translations/assistant_fr.qm
+%{_datadir}/tqt3/translations/designer_de.qm
+%{_datadir}/tqt3/translations/designer_fr.qm
+%{_datadir}/tqt3/translations/linguist_de.qm
+%{_datadir}/tqt3/translations/linguist_fr.qm
+%{_datadir}/tqt3/translations/qt_ar.qm
+%{_datadir}/tqt3/translations/qt_ca.qm
+%{_datadir}/tqt3/translations/qt_cs.qm
+%{_datadir}/tqt3/translations/qt_de.qm
+%{_datadir}/tqt3/translations/qt_es.qm
+%{_datadir}/tqt3/translations/qt_fr.qm
+%{_datadir}/tqt3/translations/qt_he.qm
+%{_datadir}/tqt3/translations/qt_it.qm
+%{_datadir}/tqt3/translations/qt_ja.qm
+%{_datadir}/tqt3/translations/qt_nb.qm
+%{_datadir}/tqt3/translations/qt_pt-br.qm
+%{_datadir}/tqt3/translations/qt_ru.qm
+%{_datadir}/tqt3/translations/qt_sk.qm
+%{_datadir}/tqt3/translations/qt_zh-cn.qm
+%{_datadir}/tqt3/translations/qt_zh-tw.qm
 
 ##########
 
-%if 0%{?with_ibase}
-%package ibase
-Summary: ibase drivers for TQt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+%package -n tqt3-doc
+Summary:	TQt3 API documentation
+Group:		System/GUI/Other
 
-%description ibase
-ibase driver for TQt 3's SQL classes (QSQL)
+%description -n tqt3-doc
+This package contains the complete API documentation for TQt3.
+Examples to coding are in tqt3-examples. The documentation is provided
+in HTML and manpage format; the HTML version can be viewed in conjunction
+with the TQt Assistant.
 
-%files ibase
+%files -n tqt3-doc
 %defattr(-,root,root,-)
-%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlibase.so
-%endif
+%{_datadir}/tqt3/doc/html/*
 
 ##########
 
-%package designer
-Summary: In3erface designer (IDE) for the TQt 3 toolkit
-Group: Development/Tools
-Requires: %{name}-devel = %{version}-%{release}
+%package -n tqt3-examples
+summary:	 Examples for TQt3
+Group:		System/GUI/Other
 
-%description designer
-The %{name}-designer package contains an User Interface designer tool
-for the TQt 3 toolkit.
+%description -n tqt3-examples
+These are examples provided with TQt3. They may be especially useful for
+you if you are learning to program in TQt as they cover tquite a lot of
+things that are possible with TQt3.
 
-%files designer
+%files -n tqt3-examples
 %defattr(-,root,root,-)
-%{tde_bindir}/tqdesigner
-%{tde_datadir}/tqt3/templates/
+%{_docdir}/tqt3-examples/build-examples
+%{_docdir}/tqt3-examples/tqt3-examples.tar.gz
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
 ##########
 
-
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+# Fix strange FTBFS on RHEL5
 %if 0%{?rhel} == 5
-#patch1 -p1 -b .ftbfs
+%__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
 %endif
 
 %patch15 -p1 -b .tqthomedir
@@ -549,15 +1193,14 @@ echo yes | ./configure \
 		${INCDIRS} \
 		${LIBDIRS} \
 		-L%{_libdir} \
-		\
-		-prefix		"%{tde_prefix}" \
-		-libdir		"%{tde_libdir}" \
-		-plugindir	"%{tde_libdir}/tqt3/plugins" \
+		-prefix		"%{_prefix}" \
+		-libdir		"%{_libdir}" \
 		-sysconfdir	"%{_sysconfdir}/tqt3" \
-		-datadir	"%{tde_datadir}/tqt3" \
-		-docdir		"%{tde_datadir}/tqt3/doc" \
-		-translationdir	"%{tde_datadir}/tqt3/translations" \
-		-headerdir	"%{tde_includedir}/tqt3" \
+		-datadir	"%{_datadir}/tqt3" \
+		-headerdir	"%{_includedir}/tqt3" \
+		-docdir		"%{_datadir}/tqt3/doc" \
+		-plugindir	"%{_libdir}/tqt3/plugins" \
+		-translationdir	"%{_datadir}/tqt3/translations" \
 		\
 		-thread \
 		-shared \
@@ -623,13 +1266,14 @@ echo yes | ./configure \
 %__make -C tools/tqvfb
 
 # fix .prl files
-%__sed -i lib/*.prl -e "s|${QTDIR}|%{tde_datadir}/tqt3|g"
+%__sed -i lib/*.prl -e "s|${QTDIR}|%{_datadir}/tqt3|g"
 
 
 %install
 %__rm -rf %{buildroot}
 export QTDIR=$(pwd)
-export PATH=${QTDIR}/bin:$PATH
+export PATH="${QTDIR}/bin:${PATH}"
+export LD_LIBRARY_PATH=${QTDIR}/lib
 
 # Installs 'libtqt-mt.so.3' library
 %__make -C src INSTALL_ROOT=%{?buildroot} install_target
@@ -646,8 +1290,77 @@ export PATH=${QTDIR}/bin:$PATH
 %__install -m755 bin/tqtconv2ui %{?buildroot}%{_bindir}/tqtconv2ui
 
 # install tqvfb
-%__install -m755 tools/tqvfb/tqvfb %{?buildroot}%{_bindir}/tqvfb
+%__install -m755 -D tools/tqvfb/tqvfb %{?buildroot}%{_bindir}/tqvfb
+%__install -m644 -D tools/tqvfb/pda.skin %{?buildroot}%{_sysconfdir}/tqt3/tqvfb/pda.skin
+%__install -m644 -D tools/tqvfb/pda_down.png %{?buildroot}%{_datadir}/tqvfb/pda_down.png
+%__install -m644 -D tools/tqvfb/pda_up.png %{?buildroot}%{_datadir}/tqvfb/pda_up.png
+
+## create tqt3-apps-dev-package
+cp tools/designer/interfaces/*.h %{?buildroot}%{?_includedir}/tqt3/
+cp tools/designer/editor/*.h %{?buildroot}%{?_includedir}/tqt3/
+
+# language file for linguist
+%__install -D translations/qt_untranslated.ts %{?buildroot}%{?_docdir}/tqt3-linguist/qt_untranslated.ts
+
+# fix that stupid friggin professional file
+perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri
+
+## i18n files for designer, linguist and assistant
+for i in designer/designer assistant linguist/linguist; do
+  pushd "tools/${i}"
+  tqlrelease "${i##*/}.pro"
+  for j in ${i##*/}_*.qm; do
+    install -m644 "${j}" %{?buildroot}%{_datadir}/tqt3/translations/
+  done
+  popd
+done
 
+# desktop lnk files
+#install -m644 -D "%{SOURCE1}" "%{?buildroot}%{_datadir}/applications/assistant-tqt3.desktop"
+#install -m644 -D "%{SOURCE2}" "%{?buildroot}%{_datadir}/applications/designer-tqt3.desktop"
+#install -m644 -D "%{SOURCE3}" "%{?buildroot}%{_datadir}/applications/linguist-tqt3.desktop"
+#install -m644 -D "%{SOURCE4}" "%{?buildroot}%{_datadir}/applications/tqt3config.desktop"
+
+# build attic package and copy it to libtqt3-compat-headers
+pushd src
+tar cvvfz attic.tar.gz attic/
+install -D attic.tar.gz %{?buildroot}%{_docdir}/libtqt3-compat-headers/attic.tar.gz
+popd
+
+# install the man pages
+install -D doc/man/man1/moc.1 %{?buildroot}%{_mandir}/man1/moc-tqt3.1
+install -D doc/man/man1/uic.1 %{?buildroot}%{_mandir}/man1/uic-tqt3.1
+install -D doc/man/man1/lrelease.1 %{?buildroot}%{_mandir}/man1/lrelease-tqt3.1
+install -D doc/man/man1/lupdate.1 %{?buildroot}%{_mandir}/man1/lupdate-tqt3.1
+
+# Install source for the designer tools, such as tqtcreatecw.
+cp -ra tools/designer/tools %{?buildroot}%{_datadir}/tqt3/tools
+rm -f %{?buildroot}%{_datadir}/tqt3/tools/tqtcreatecw/tqtcreatecw
+rm -rf %{?buildroot}%{_datadir}/tqt3/tools/tqtcreatecw/.moc
+rm -rf %{?buildroot}%{_datadir}/tqt3/tools/tqtcreatecw/.obj
+rm -f %{?buildroot}%{_datadir}/tqt3/tools/tqtcreatecw/Makefile
+rm -f %{?buildroot}%{_datadir}/tqt3/tools/tqtconv2ui/tqtconv2ui
+rm -rf %{?buildroot}%{_datadir}/tqt3/tools/tqtconv2ui/.moc
+rm -rf %{?buildroot}%{_datadir}/tqt3/tools/tqtconv2ui/.obj
+rm -f %{?buildroot}%{_datadir}/tqt3/tools/tqtconv2ui/Makefile
+
+# create examples package
+%__install -d tqt3-examples
+cp -ax examples tqt3-examples/
+cp -ax tutorial tqt3-examples/
+mkdir -p tqt3-examples/tools/designer
+cp -ax tools/designer/examples tqt3-examples/tools/designer/
+mkdir -p tqt3-examples/tools/linguist
+cp -ax tools/linguist/tutorial tqt3-examples/tools/linguist/
+find tqt3-examples -name "tt1" -print | xargs rm -rf
+find tqt3-examples -name "tt2" -print | xargs rm -rf
+find tqt3-examples -name "tt3" -print | xargs rm -rf
+find tqt3-examples -name ".moc" | xargs rm -rf
+find tqt3-examples -name ".obj" | xargs rm -rf
+find tqt3-examples -name "Makefile" | xargs rm -rf
+install -D -m 755 %{SOURCE5} %{?buildroot}%{_docdir}/tqt3-examples/build-examples
+tar cvvfz tqt3-examples.tar.gz tqt3-examples/
+install -D tqt3-examples.tar.gz %{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/dependencies/tqt3/tqt3config.desktop b/redhat/dependencies/tqt3/tqt3config.desktop
new file mode 120000
index 000000000..01b50805b
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqt3config.desktop
@@ -0,0 +1 @@
+../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/tqt3config.desktop
\ No newline at end of file
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 603f70ebc..2d9911e0c 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -1,31 +1,60 @@
-# TDE specific building variables
+#
+# spec file for package tqtinterface
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# TDE variables
 %define tde_version 14.0.0
-%define tde_prefix /usr
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define cmake_modules_dir %{_datadir}/cmake/Modules
 
 Name:		trinity-tqtinterface
-Version:	%{tde_version}
+Epoch:		1
+Version:	4.2.0
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity QT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
+Summary:	The Trinity Qt Interface Libraries
+Group:		System/GUI/Other
 URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{tde_prefix}
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
-Requires:		trinity-tqt3 >= 3.5.0
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	libtqt3-mt-devel >= 3.5.0
+BuildRequires:	tqt3-dev-tools >= 3.5.0
 
+%if 0%{?suse_version} && 0%{?suse_version} < 1300
+BuildRequires:	trinity-cmake-macros
+%endif
+
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
 
 # PTHREAD support
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@@ -46,76 +75,118 @@ BuildRequires:	libXi-devel
 BuildRequires:	libXi6-devel
 %endif
 
-Obsoletes:	tqtinterface < %{version}-%{release}
-Provides:	tqtinterface = %{version}-%{release}
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
 
 
 %description
-Trinity QT Interface
+The Trinity Qt Interface is a library that abstracts Qt from Trinity.
+This allows the Trinity code to rapidly port from one version of Qt to another.
+This is primarily accomplished by defining old functions in terms of new functions,
+although some code has been added for useful functions that are no longer part of Qt.
 
 
-%post
-/sbin/ldconfig || :
+##########
 
-%postun
-/sbin/ldconfig || :
+%package -n libtqt4
+Group:		System/GUI/Other
+Summary:	The Trinity Qt Interface Libraries
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:		libtqt3-mt >= 3.5.0
+%if 0%{?suse_version} && 0%{?suse_version} < 1300
+Requires:		trinity-cmake-macros
+%endif
+
+Obsoletes:	trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n libtqt4
+The Trinity Qt Interface is a library that abstracts Qt from Trinity.
+This allows the Trinity code to rapidly port from one version of Qt to another.
+This is primarily accomplished by defining old functions in terms of new functions,
+although some code has been added for useful functions that are no longer part of Qt.
 
-%files
+%files -n libtqt4
 %defattr(-,root,root,-)
-%{tde_bindir}/convert_qt_tqt1
-%{tde_bindir}/convert_qt_tqt2
-%{tde_bindir}/convert_qt_tqt3
-%{tde_bindir}/dcopidl-tqt
-%{tde_bindir}/dcopidl2cpp-tqt
-%{tde_bindir}/dcopidlng-tqt
-%{tde_bindir}/mcopidl-tqt
-%{tde_bindir}/moc-tqt
-%{tde_bindir}/tmoc
-%{tde_bindir}/tqt-replace
-%{tde_bindir}/tqt-replace-stream
-%{tde_bindir}/uic-tqt
-%{tde_libdir}/libtqt.so.4
-%{tde_libdir}/libtqt.so.4.2.0
+%{_libdir}/libtqt.so.4
+%{_libdir}/libtqt.so.4.2.0
+
+%post -n libtqt4
+/sbin/ldconfig || :
+
+%postun -n libtqt4
+/sbin/ldconfig || :
 
 ##########
 
-%package devel
+%package -n libtqt4-devel
 Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tqt3-devel >= 3.5.0
+Summary:	The Trinity Qt Interface Libraries (Development Files)
+Requires:	libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libtqt3-mt-devel >= 3.5.0
+Requires:	tqt3-dev-tools >= 3.5.0
+
+%if 0%{?suse_version} && 0%{?suse_version} < 1300
+Requires:		trinity-cmake-macros
+%endif
 
-Obsoletes:	tqtinterface-devel < %{version}-%{release}
-Provides:	tqtinterface-devel = %{version}-%{release}
+Obsoletes:	trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description devel
-Development files for %{name}
+%description -n libtqt4-devel
+The Trinity Qt Interface is a library that abstracts Qt from Trinity.
+This allows the Trinity code to rapidly port from one version of Qt to another.
+This is primarily accomplished by defining old functions in terms of new functions,
+although some code has been added for useful functions that are no longer part of Qt.
 
-%post devel
+%post -n libtqt4-devel
 /sbin/ldconfig || :
 
-%postun devel
+%postun -n libtqt4-devel
 /sbin/ldconfig || :
 
-%files devel
+%files -n libtqt4-devel
 %defattr(-,root,root,-)
-%{tde_includedir}/tqt/
-%{tde_libdir}/libtqt.la
-%{tde_libdir}/libtqt.so
-%{tde_libdir}/pkgconfig/tqt.pc
-%{tde_libdir}/pkgconfig/tqtqui.pc
+%{_bindir}/convert_qt_tqt1
+%{_bindir}/convert_qt_tqt2
+%{_bindir}/convert_qt_tqt3
+%{_bindir}/dcopidl-tqt
+%{_bindir}/dcopidl2cpp-tqt
+%{_bindir}/dcopidlng-tqt
+%{_bindir}/mcopidl-tqt
+%{_bindir}/moc-tqt
+%{_bindir}/tmoc
+%{_bindir}/tqt-replace
+%{_bindir}/tqt-replace-stream
+%{_bindir}/uic-tqt
+%{_includedir}/tqt/
+%{_libdir}/libtqt.la
+%{_libdir}/libtqt.so
+%{_libdir}/pkgconfig/tqt.pc
+%{_libdir}/pkgconfig/tqtqui.pc
 %{cmake_modules_dir}/*.cmake
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
 ##########
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 
 %build
@@ -135,17 +206,17 @@ fi
   -DWITH_GCC_VISIBILITY=OFF \
   \
   -DQTDIR="%{tde_datadir}/tqt3" \
-  -DQT_INCLUDE_DIR="%{tde_includedir}/tqt3" \
-  -DQT_LIBRARY_DIR="%{tde_libdir}" \
+  -DQT_INCLUDE_DIR="%{_includedir}/tqt3" \
+  -DQT_LIBRARY_DIR="%{_libdir}" \
   \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  -DPKGCONFIG_INSTALL_DIR="%{_libdir}/pkgconfig" \
+  -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \
+  -DLIB_INSTALL_DIR=%{_libdir} \
+  -DBIN_INSTALL_DIR=%{_bindir} \
   \
-  -DCMAKE_LIBRARY_PATH="%{tde_libdir}" \
-  -DCMAKE_INCLUDE_PATH="%{tde_includedir}" \
+  -DCMAKE_LIBRARY_PATH="%{_libdir}" \
+  -DCMAKE_INCLUDE_PATH="%{_includedir}" \
   \
   -DWITH_QT3="ON" \
   -DBUILD_ALL="ON" \
@@ -171,5 +242,5 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1:4.2.0-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/extras/trinity-cmake-macros/trinity-cmake-macros.spec b/redhat/extras/trinity-cmake-macros/trinity-cmake-macros.spec
new file mode 100644
index 000000000..8ef5c62b3
--- /dev/null
+++ b/redhat/extras/trinity-cmake-macros/trinity-cmake-macros.spec
@@ -0,0 +1,40 @@
+Name:           trinity-cmake-macros
+Version:        1.0
+Release:        1%{?dist}
+Summary:        Rpmbuild macros for cmake utility
+
+Group:          Development/Utilities
+License:        GPL
+URL:            http://www.trinitydesktop.org/
+Source0:        macros.cmake
+
+Requires:       cmake
+
+%description
+This is the cmake macros for rpmbuild.
+It was originally written for Fedora, but can be used on openSUSE too.
+
+
+%prep
+
+
+%build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%__install -D -m 644 "%{SOURCE0}" %{?buildroot}%{_sysconfdir}/rpm/macros.cmake
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%{_sysconfdir}/rpm/macros.cmake
+
+
+%changelog
+* Mon Sep 29 2014 François Andriot <francois.andriot@free.fr> - 1.0-1
+- Initial build for openSUSE
diff --git a/redhat/packages.el6 b/redhat/packages.el6
index 97b938e90..6d55e8cdb 100644
--- a/redhat/packages.el6
+++ b/redhat/packages.el6
@@ -80,6 +80,7 @@ libXaw-devel
 libXcomposite-devel
 libXdamage-devel
 libXdmcp-devel
+libXScrnSaver-devel
 libXtst-devel
 libXv-devel
 libXxf86dga-devel
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index cf2e05165..b05699d96 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -1,13 +1,32 @@
-# Remove qt-devel and qt3-devel and any kde*-devel that may interfere !!!
+#
+# spec file for package tdelibs
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
 %endif
 
+# TDE variables
 %define tde_version 14.0.0
-
-# TDE specific variables
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,14 +42,19 @@
 Name:			trinity-tdelibs
 Version:		%{tde_version}
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:		GPL
 Summary:		TDE Libraries
-Group:			Environment/Libraries
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
+Group:			System/GUI/Other
 URL:			http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:			Trinity Project
+#Packager:		Francois Andriot <francois.andriot@free.fr>
+
 Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
diff --git a/redhat/tdewebdev/kdewebdev-3.5.13.1.spec b/redhat/tdewebdev/kdewebdev-3.5.13.1.spec
index 6d664bab4..05d8411b2 100644
--- a/redhat/tdewebdev/kdewebdev-3.5.13.1.spec
+++ b/redhat/tdewebdev/kdewebdev-3.5.13.1.spec
@@ -83,7 +83,7 @@ Requires: trinity-kxsldbg = %{version}-%{release}
 ##########
 
 %package -n trinity-quanta
-Summary:	web development environment for KDE [Trinity]
+Summary:	web development environment for TDE [Trinity]
 Group:		Applications/Development
 Requires:	trinity-kfilereplace = %{version}-%{release}
 Requires:	trinity-klinkstatus = %{version}-%{release}
@@ -100,7 +100,7 @@ to all markup languages, while supporting popular web-based scripting
 languages, CSS and other emerging W3C recommendations.
 
 Quanta Plus supports many external components, debuggers and other tools
-for web development, several of which are shipped with the KDE web
+for web development, several of which are shipped with the TDE web
 development module.
 
 Quanta Plus is not in any way affiliated with any commercial versions
@@ -163,11 +163,11 @@ This package is part of TDE, as a component of the TDE web development module.
 ##########
 
 %package -n trinity-kfilereplace
-Summary:	batch search-and-replace component for KDE [Trinity]
+Summary:	batch search-and-replace component for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-kfilereplace
-KFileReplace is an embedded component for KDE that acts as a batch
+KFileReplace is an embedded component for TDE that acts as a batch
 search-and-replace tool. It allows you to replace one expression with
 another in many files at once.
 
@@ -206,7 +206,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-kimagemapeditor
-Summary:	HTML image map editor for KDE [Trinity]
+Summary:	HTML image map editor for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-kimagemapeditor
@@ -244,11 +244,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-klinkstatus
-Summary:	web link validity checker for KDE [Trinity]
+Summary:	web link validity checker for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-klinkstatus
-KLinkStatus is KDE's web link validity checker. It allows you to
+KLinkStatus is TDE's web link validity checker. It allows you to
 search internal and external links throughout your web site. Simply
 point it to a single page and choose the depth to search.
 
@@ -396,13 +396,13 @@ This package is part of TDE, as a component of the TDE web development module.
 ##########
 
 %package -n trinity-kxsldbg
-Summary:	graphical XSLT debugger for KDE [Trinity]
+Summary:	graphical XSLT debugger for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-kxsldbg
 KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
 interface as well as a text-based debugger. KXSLDbg can be run as a
-standalone application or as an embedded KDE part.
+standalone application or as an embedded TDE part.
 
 XSLT is an XML language for defining transformations of XML files from
 XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
@@ -496,8 +496,8 @@ unset QTDIR || : ; source /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
+# Do not build against any "/usr" installed TDE
+export TDEDIR=%{tde_prefix}
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
diff --git a/redhat/tdewebdev/kdewebdev-3.5.13.spec b/redhat/tdewebdev/kdewebdev-3.5.13.spec
index 2dec2ccc3..15d0fe01a 100644
--- a/redhat/tdewebdev/kdewebdev-3.5.13.spec
+++ b/redhat/tdewebdev/kdewebdev-3.5.13.spec
@@ -85,7 +85,7 @@ Requires: trinity-kxsldbg = %{version}-%{release}
 ##########
 
 %package -n trinity-quanta
-Summary:	web development environment for KDE [Trinity]
+Summary:	web development environment for TDE [Trinity]
 Group:		Applications/Development
 Requires:	trinity-kfilereplace = %{version}-%{release}
 Requires:	trinity-klinkstatus = %{version}-%{release}
@@ -102,7 +102,7 @@ to all markup languages, while supporting popular web-based scripting
 languages, CSS and other emerging W3C recommendations.
 
 Quanta Plus supports many external components, debuggers and other tools
-for web development, several of which are shipped with the KDE web
+for web development, several of which are shipped with the TDE web
 development module.
 
 Quanta Plus is not in any way affiliated with any commercial versions
@@ -165,11 +165,11 @@ This package is part of TDE, as a component of the TDE web development module.
 ##########
 
 %package -n trinity-kfilereplace
-Summary:	batch search-and-replace component for KDE [Trinity]
+Summary:	batch search-and-replace component for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-kfilereplace
-KFileReplace is an embedded component for KDE that acts as a batch
+KFileReplace is an embedded component for TDE that acts as a batch
 search-and-replace tool. It allows you to replace one expression with
 another in many files at once.
 
@@ -208,7 +208,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-kimagemapeditor
-Summary:	HTML image map editor for KDE [Trinity]
+Summary:	HTML image map editor for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-kimagemapeditor
@@ -246,11 +246,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-klinkstatus
-Summary:	web link validity checker for KDE [Trinity]
+Summary:	web link validity checker for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-klinkstatus
-KLinkStatus is KDE's web link validity checker. It allows you to
+KLinkStatus is TDE's web link validity checker. It allows you to
 search internal and external links throughout your web site. Simply
 point it to a single page and choose the depth to search.
 
@@ -398,13 +398,13 @@ This package is part of TDE, as a component of the TDE web development module.
 ##########
 
 %package -n trinity-kxsldbg
-Summary:	graphical XSLT debugger for KDE [Trinity]
+Summary:	graphical XSLT debugger for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-kxsldbg
 KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
 interface as well as a text-based debugger. KXSLDbg can be run as a
-standalone application or as an embedded KDE part.
+standalone application or as an embedded TDE part.
 
 XSLT is an XML language for defining transformations of XML files from
 XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
diff --git a/redhat/tdewebdev/tdewebdev-14.0.0.spec b/redhat/tdewebdev/tdewebdev-14.0.0.spec
index f4669ed29..cc00be441 100644
--- a/redhat/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/tdewebdev/tdewebdev-14.0.0.spec
@@ -90,7 +90,7 @@ Requires: trinity-kommander = %{version}-%{release}
 ##########
 
 %package -n trinity-quanta
-Summary:	web development environment for KDE [Trinity]
+Summary:	web development environment for TDE [Trinity]
 Group:		Applications/Development
 Requires:	trinity-tdefilereplace = %{version}-%{release}
 Requires:	trinity-klinkstatus = %{version}-%{release}
@@ -107,7 +107,7 @@ to all markup languages, while supporting popular web-based scripting
 languages, CSS and other emerging W3C recommendations.
 
 Quanta Plus supports many external components, debuggers and other tools
-for web development, several of which are shipped with the KDE web
+for web development, several of which are shipped with the TDE web
 development module.
 
 Quanta Plus is not in any way affiliated with any commercial versions
@@ -170,14 +170,14 @@ This package is part of TDE, as a component of the TDE web development module.
 ##########
 
 %package -n trinity-tdefilereplace
-Summary:	batch search-and-replace component for KDE [Trinity]
+Summary:	batch search-and-replace component for TDE [Trinity]
 Group:		Applications/Development
 
 Obsoletes:	trinity-kfilereplace < %{version}-%{release}
 Provides:	trinity-kfilereplace = %{version}-%{release}
 
 %description -n trinity-tdefilereplace
-tdefileReplace is an embedded component for KDE that acts as a batch
+tdefileReplace is an embedded component for TDE that acts as a batch
 search-and-replace tool. It allows you to replace one expression with
 another in many files at once.
 
@@ -259,7 +259,7 @@ Summary:	web link validity checker for TDE
 Group:		Applications/Development
 
 %description -n trinity-klinkstatus
-KLinkStatus is KDE's web link validity checker. It allows you to
+KLinkStatus is TDE's web link validity checker. It allows you to
 search internal and external links throughout your web site. Simply
 point it to a single page and choose the depth to search.
 
@@ -408,13 +408,13 @@ This package is part of TDE, as a component of the TDE web development module.
 %if 0%{?build_kxsldbg}
 
 %package -n trinity-kxsldbg
-Summary:	graphical XSLT debugger for KDE [Trinity]
+Summary:	graphical XSLT debugger for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-kxsldbg
 KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
 interface as well as a text-based debugger. KXSLDbg can be run as a
-standalone application or as an embedded KDE part.
+standalone application or as an embedded TDE part.
 
 XSLT is an XML language for defining transformations of XML files from
 XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
diff --git a/redhat/tdewebdev/tdewebdev-3.5.13.2.spec b/redhat/tdewebdev/tdewebdev-3.5.13.2.spec
index 267e517ac..5bfa10efa 100644
--- a/redhat/tdewebdev/tdewebdev-3.5.13.2.spec
+++ b/redhat/tdewebdev/tdewebdev-3.5.13.2.spec
@@ -88,7 +88,7 @@ Requires: trinity-kommander = %{version}-%{release}
 ##########
 
 %package -n trinity-quanta
-Summary:	web development environment for KDE [Trinity]
+Summary:	web development environment for TDE [Trinity]
 Group:		Applications/Development
 Requires:	trinity-kfilereplace = %{version}-%{release}
 Requires:	trinity-klinkstatus = %{version}-%{release}
@@ -105,7 +105,7 @@ to all markup languages, while supporting popular web-based scripting
 languages, CSS and other emerging W3C recommendations.
 
 Quanta Plus supports many external components, debuggers and other tools
-for web development, several of which are shipped with the KDE web
+for web development, several of which are shipped with the TDE web
 development module.
 
 Quanta Plus is not in any way affiliated with any commercial versions
@@ -168,11 +168,11 @@ This package is part of TDE, as a component of the TDE web development module.
 ##########
 
 %package -n trinity-kfilereplace
-Summary:	batch search-and-replace component for KDE [Trinity]
+Summary:	batch search-and-replace component for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-kfilereplace
-KFileReplace is an embedded component for KDE that acts as a batch
+KFileReplace is an embedded component for TDE that acts as a batch
 search-and-replace tool. It allows you to replace one expression with
 another in many files at once.
 
@@ -211,7 +211,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-kimagemapeditor
-Summary:	HTML image map editor for KDE [Trinity]
+Summary:	HTML image map editor for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-kimagemapeditor
@@ -249,11 +249,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 ##########
 
 %package -n trinity-klinkstatus
-Summary:	web link validity checker for KDE [Trinity]
+Summary:	web link validity checker for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-klinkstatus
-KLinkStatus is KDE's web link validity checker. It allows you to
+KLinkStatus is TDE's web link validity checker. It allows you to
 search internal and external links throughout your web site. Simply
 point it to a single page and choose the depth to search.
 
@@ -402,13 +402,13 @@ This package is part of TDE, as a component of the TDE web development module.
 %if 0%{?build_kxsldbg}
 
 %package -n trinity-kxsldbg
-Summary:	graphical XSLT debugger for KDE [Trinity]
+Summary:	graphical XSLT debugger for TDE [Trinity]
 Group:		Applications/Development
 
 %description -n trinity-kxsldbg
 KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
 interface as well as a text-based debugger. KXSLDbg can be run as a
-standalone application or as an embedded KDE part.
+standalone application or as an embedded TDE part.
 
 XSLT is an XML language for defining transformations of XML files from
 XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
@@ -501,8 +501,8 @@ unset QTDIR || : ; source /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
-# Do not build against any "/usr" installed KDE
-export KDEDIR="%{tde_prefix}"
+# Do not build against any "/usr" installed TDE
+export TDEDIR="%{tde_prefix}"
 
 # Specific path for RHEL4
 if [ -d "/usr/X11R6" ]; then
diff --git a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff
index ebdf4630a..696f9093c 100644
--- a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/usr/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -14,7 +14,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
     if ! test -f $kdepotpath; then
- 	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+ 	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
     fi
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/control b/ubuntu/maverick/applications/kopete-otr/debian/control
index 711b9549e..8af438bc8 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/control
+++ b/ubuntu/maverick/applications/kopete-otr/debian/control
@@ -3,9 +3,8 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
-Homepage: http://kopete-otr.follefuder.org/
 
 Package: kopete-otr-trinity
 Architecture: any
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules
index 5046494ad..217eea9ed 100755..100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/maverick/applications/tde-guidance/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
 DEB_PYTHON_SYSTEM = pysupport
+PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
+GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
+export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 #include /usr/share/cdbs/1/class/python-distutils.mk
@@ -11,7 +14,7 @@ include /usr/share/cdbs/1/rules/utils.mk
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_UPDATE_RCD_PARAMS := multiuser
 DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1  debian/serviceconfig-trinity.1  debian/userconfig-trinity.1
-PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
+PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH)
 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
 
@@ -43,11 +46,11 @@ install/tde-guidance-trinity::
 
 	# fix the link properly
 	mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
-	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
-#	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
+	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
+#	(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig)
 
 	# move python modules in PYSUPPORT_PATH
 	mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
@@ -87,51 +90,6 @@ install/guidance-backends-trinity::
 	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity
 	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity
 
-install/tde-guidance-powermanager-trinity::
-	# install icon to right place
-	install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
-		$(DEB_DESTDIR)/opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png
-	install -D -p -m0644 kde/powermanager/pics/*.png \
-		$(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/
-
-	# install desktop file
-	install -D -p -m0644 powermanager/guidance-power-manager.desktop \
-		$(DEB_DESTDIR)/opt/trinity/share/autostart/guidance-power-manager.desktop
-
-	# copy python modules in PYSUPPORT_PATH
-	mkdir -p $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/guidance-power-manager.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanage.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/gpmhelper.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp powermanager/guidance_power_manager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp powermanager/notify.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-	cp powermanager/tooltip.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
-
-	# generate guidance-power-manager script
-	echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
-	echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
-	chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
-
-	# fix script-not-executable
-	chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/powermanage.py
-	chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/gpmhelper.py
-
-	: # Replace all '#!' calls to python with /usr/bin/python
-	: # and make them executable
-	for i in `find debian/tde-guidance-powermanager-trinity -type f`; do \
-		sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
-			$$i > $$i.temp; \
-		if cmp --quiet $$i $$i.temp; then \
-			rm -f $$i.temp; \
-		else \
-			mv -f $$i.temp $$i; \
-			chmod 755 $$i; \
-			echo "fixed interpreter: $$i"; \
-		fi; \
-	done
-
 clean::
 	rm -rf build
 
@@ -155,9 +113,6 @@ clean::
 
 common-install-prehook-impl::
 	# generate form implementation using pytde user interface compiler
-	(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
-	(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
-	(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
 
 	mkdir -p po
 	touch list
@@ -190,4 +145,3 @@ common-install-prehook-impl::
 	fi
 
 	rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version
-	rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-powermanager-trinity/.version
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
index 7a0a28549..fe690a9c2 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
+++ b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
@@ -1,7 +1,7 @@
-opt/trinity/lib/trinity/kcm_serviceconfig.la opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_userconfig.la opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_serviceconfig.la
+opt/trinity/lib/trinity/kcm_userconfig.la
+opt/trinity/lib/trinity/kcm_mountconfig.la
+opt/trinity/lib/trinity/kcm_wineconfig.la
 opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
@@ -57,8 +57,8 @@ opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py
 opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py
 opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py
 opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py
-opt/trinity/lib/trinity/kcm_serviceconfig.so opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_userconfig.so opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/
-opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/
+opt/trinity/lib/trinity/kcm_serviceconfig.so
+opt/trinity/lib/trinity/kcm_userconfig.so
+opt/trinity/lib/trinity/kcm_mountconfig.so
+opt/trinity/lib/trinity/kcm_wineconfig.so
 usr/share/lintian/overrides/tde-guidance-trinity
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules
index b8b687940..2f57b4b0b 100755
--- a/ubuntu/maverick/dependencies/python-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules
@@ -52,6 +52,7 @@ build-%/configure-stamp:
 	cd build-$* && echo yes \
                 | python$* ../configure.py \
                         -c -n /usr/include/tqscintilla \
+                        -e python$* \
                         -o /usr/lib -u -j $(SPLIT) \
                         -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
                         -l /usr/include/python$* \
@@ -66,6 +67,7 @@ dbg-build-%/configure-stamp:
 	cd dbg-build-$* && echo yes \
                 | python$*-dbg ../configure.py \
                         -c -n /usr/include/tqscintilla \
+                        -e python$* \
                         -o /usr/lib -u -j $(SPLIT) \
                         -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
                         -l /usr/include/python$*_d \
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
index df0c6da05..86a541601 100755
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
@@ -41,6 +41,7 @@ build-%/configure-stamp:
 	cd build-$* \
 		&& python$* ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+			-g python$* \
 			-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
 	touch $@
 
@@ -50,6 +51,7 @@ dbg-build-%/configure-stamp:
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+			-g python$* \
 			-e /usr/include/python$*_d \
 			-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
 	touch $@
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules
index 473caac7d..ff41b19f7 100755
--- a/ubuntu/maverick/libraries/python-trinity/debian/rules
+++ b/ubuntu/maverick/libraries/python-trinity/debian/rules
@@ -48,6 +48,7 @@ build-%/configure-stamp:
 	mkdir -p build-$*
 	cd build-$* && python$* ../configure.py \
 		-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
+		-e python$* \
 		-v /opt/trinity/share/sip/trinity -j $(SPLIT)
 	touch $@
 
@@ -56,6 +57,7 @@ dbg-build-%/configure-stamp:
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* && python$*-dbg ../configure.py \
 		-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
+		-e python$* \
 		-v /opt/trinity/share/sip/trinity -j $(SPLIT)
 	touch $@
 
diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index 153082462..0a71d8964 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -105,9 +105,9 @@ common-install-prehook-impl::
 #		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
 #	done
 
-#	msgcat --use-first kde.pot po/tdelibs.pot > tdelibs.pot-merged
+#	msgcat --use-first tde.pot po/tdelibs.pot > tdelibs.pot-merged
 #	mv -f tdelibs.pot-merged po/tdelibs.pot
-	cp -Rp kde.pot po/tdelibs.pot
+	cp -Rp tde.pot po/tdelibs.pot
 
 	# generate .po files for .desktop etc files
 	if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index c69d5700b..21dafee6a 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -241,7 +241,7 @@ debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png
 debian/tmp/opt/trinity/share/apps/kjava/kjava.jar
 debian/tmp/opt/trinity/share/apps/kjava/kjava.policy
 debian/tmp/opt/trinity/share/apps/kjava/pluginsinfo
-debian/tmp/opt/trinity/share/apps/knewstuff/types
+debian/tmp/opt/trinity/share/apps/tdenewstuff/types
 debian/tmp/opt/trinity/share/apps/knotify/eventsrc
 debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog
 debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog.xml
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install
index 4a738709b..73c87967b 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install
@@ -218,7 +218,7 @@ debian/tmp/opt/trinity/include/tdesensordevice.h
 debian/tmp/opt/trinity/include/tdestoragedevice.h
 debian/tmp/opt/trinity/include/tdelibs_export.h
 debian/tmp/opt/trinity/include/kdemacros.h
-debian/tmp/opt/trinity/include/kde.pot
+debian/tmp/opt/trinity/include/tde.pot
 debian/tmp/opt/trinity/include/tdeprint/driver.h
 debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
 debian/tmp/opt/trinity/include/tdeprint/kmjob.h
@@ -433,16 +433,16 @@ debian/tmp/opt/trinity/include/tdemulticastsocket.h
 debian/tmp/opt/trinity/include/tdemultipledrag.h
 debian/tmp/opt/trinity/include/tdemultitabbar.h
 debian/tmp/opt/trinity/include/knetworkinterface.h
-debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h
-debian/tmp/opt/trinity/include/knewstuff/engine.h
-debian/tmp/opt/trinity/include/knewstuff/entry.h
-debian/tmp/opt/trinity/include/knewstuff/knewstuffbutton.h
-debian/tmp/opt/trinity/include/knewstuff/knewstuffgeneric.h
-debian/tmp/opt/trinity/include/knewstuff/knewstuff.h
-debian/tmp/opt/trinity/include/knewstuff/knewstuffsecure.h
-debian/tmp/opt/trinity/include/knewstuff/providerdialog.h
-debian/tmp/opt/trinity/include/knewstuff/provider.h
-debian/tmp/opt/trinity/include/knewstuff/uploaddialog.h
+debian/tmp/opt/trinity/include/tdenewstuff/downloaddialog.h
+debian/tmp/opt/trinity/include/tdenewstuff/engine.h
+debian/tmp/opt/trinity/include/tdenewstuff/entry.h
+debian/tmp/opt/trinity/include/tdenewstuff/knewstuffbutton.h
+debian/tmp/opt/trinity/include/tdenewstuff/knewstuffgeneric.h
+debian/tmp/opt/trinity/include/tdenewstuff/knewstuff.h
+debian/tmp/opt/trinity/include/tdenewstuff/knewstuffsecure.h
+debian/tmp/opt/trinity/include/tdenewstuff/providerdialog.h
+debian/tmp/opt/trinity/include/tdenewstuff/provider.h
+debian/tmp/opt/trinity/include/tdenewstuff/uploaddialog.h
 debian/tmp/opt/trinity/include/knfsshare.h
 debian/tmp/opt/trinity/include/knotifyclient.h
 debian/tmp/opt/trinity/include/knotifydialog.h
@@ -808,8 +808,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.la
 debian/tmp/opt/trinity/lib/libtdemediaplayer.so
 debian/tmp/opt/trinity/lib/libtdemid.la
 debian/tmp/opt/trinity/lib/libtdemid.so
-debian/tmp/opt/trinity/lib/libknewstuff.la
-debian/tmp/opt/trinity/lib/libknewstuff.so
+debian/tmp/opt/trinity/lib/libtdenewstuff.la
+debian/tmp/opt/trinity/lib/libtdenewstuff.so
 debian/tmp/opt/trinity/lib/libtdentlm.la
 debian/tmp/opt/trinity/lib/libtdentlm.so
 debian/tmp/opt/trinity/lib/libtdeparts.la
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install
index af088947e..b54ca2e2f 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install
@@ -287,8 +287,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0
 debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdemid.so.0
 debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95
-debian/tmp/opt/trinity/lib/libknewstuff.so.1
-debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0
+debian/tmp/opt/trinity/lib/libtdenewstuff.so.1
+debian/tmp/opt/trinity/lib/libtdenewstuff.so.1.0.0
 debian/tmp/opt/trinity/lib/libtdentlm.so.0
 debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdeparts.so.2
diff --git a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/maverick/tdeutils/debian/rules
index eb3386805..9617d1359 100755
--- a/ubuntu/maverick/tdeutils/debian/rules
+++ b/ubuntu/maverick/tdeutils/debian/rules
@@ -34,7 +34,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DWITH_SNMP="ON" \
  -DWITH_SENSORS="ON" \
  -DWITH_XMMS="ON" \
- -DWITH_KNEWSTUFF="ON"
+ -DWITH_TDENEWSTUFF="ON"
 
 DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity
 
diff --git a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
index 20ad1b0b7..39dd7745e 100644
--- a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/opt/trinity/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
index 47aee4140..28c95742b 100644
--- a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/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/tde/kde.pot
++kdepotpath=/usr/include/tde/tde.pot
 +
  for subdir in $dirs; do
    test -z "$VERBOSE" || echo "Making messages in $subdir"
@@ -13,13 +13,13 @@
     fi
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
--   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 -   fi
-+#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \