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

45 files changed, 219 insertions, 219 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/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/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/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/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/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/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/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/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/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=. \