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

18 files changed, 34 insertions, 34 deletions

diff --git a/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff
index 782118729..de663438c 100644
--- a/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff
@@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
     if ! test -f $kdepotpath; then
- 	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+ 	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
     fi
diff --git a/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog
index bc7c7eed5..6a65281c1 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/changelog
+++ b/ubuntu/lucid_automake/kdelibs/debian/changelog
@@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low
     output them expanded even when --expandvars is not used. (Closes: #287822)
 
   * Fixed the ability of the build system to find kde.pot, even when it is not
-    located at TDEDIR/include/tde.pot. This allows the use of targets such as
+    located at TDEDIR/include/kde.pot. This allows the use of targets such as
     "package-messages" without specifying includedir. (Closes: #283858)
 
   * Now that graphviz is in main, add it to Build-Depends-Indep together with
diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff
index e705cf83b..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
diff --git a/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
index 698deb926..aca9df12a 100644
--- a/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
@@ -15,11 +15,11 @@
  
 -   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 -   if ! test -f $kdepotpath; then
--	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
+-	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 -   fi
 +#   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
 +#   if ! test -f $kdepotpath; then
-+#	kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot
++#	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
 +#   fi
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \