Fix tdebase FTBFS on Debian and Ubuntu

27 files changed, 48 insertions, 48 deletions

diff --git a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control
index 4cf6183e2..c997d25b7 100644
--- a/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/debian/lenny/applications/compizconfig-backend-tdeconfig/debian/control
@@ -11,11 +11,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
 Breaks: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
 Conflicts: libcompizconfig-backend-tdeconfig-trinity
-Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project
+Description: TDEConfig [Trinity] Settings library for plugins - OpenCompositing Project
  The OpenCompositing Project brings 3D desktop visual effects that improve
  usability of the X Window System and provide increased productivity
  through plugins and themes contributed by the community giving a
  rich desktop experience.
  .
- This package contains the KConfig (Trinity) settings backend for
+ This package contains the TDEConfig (Trinity) settings backend for
  libcompizconfig.
diff --git a/debian/lenny/libraries/python-trinity/debian/changelog b/debian/lenny/libraries/python-trinity/debian/changelog
index 0c28cec76..6c46847ae 100644
--- a/debian/lenny/libraries/python-trinity/debian/changelog
+++ b/debian/lenny/libraries/python-trinity/debian/changelog
@@ -277,7 +277,7 @@ python-trinity (3.15.2+20060422-2) unstable; urgency=low
 python-trinity (3.15.2+20060422-1) unstable; urgency=low
 
   * New upstream release
-    * KConfigSkeleton works now (Closes: #310919)
+    * TDEConfigSkeleton works now (Closes: #310919)
     * KABC is included (Closes: #362443)
   * Depend on python2.x-sip4 instead of python2.x-sip4-qt3
   * Bump build-depends on sip4 to 4.4.2 and dependencies on PyQt to 3.16
diff --git a/debian/lenny/tdebase/debian/man/kreadconfig-trinity.1 b/debian/lenny/tdebase/debian/man/kreadconfig-trinity.1
index 5bd6f869c..30151e789 100644
--- a/debian/lenny/tdebase/debian/man/kreadconfig-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kreadconfig-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read KConfig entries"
+.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read TDEConfig entries"
 .SH NAME
 kreadconfig
-\- Read KConfig entries (for use in shell scripts)
+\- Read TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
 \fBkreadconfig\fP [Qt\-options] [KDE\-options] [options] 
 .SH DESCRIPTION
diff --git a/debian/lenny/tdebase/debian/man/kwriteconfig-trinity.1 b/debian/lenny/tdebase/debian/man/kwriteconfig-trinity.1
index c98ebd1d4..266bc5560 100644
--- a/debian/lenny/tdebase/debian/man/kwriteconfig-trinity.1
+++ b/debian/lenny/tdebase/debian/man/kwriteconfig-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write KConfig entries"
+.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write TDEConfig entries"
 .SH NAME
 kwriteconfig
-\- Write KConfig entries (for use in shell scripts)
+\- Write TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
 \fBkwriteconfig\fP [Qt\-options] [KDE\-options] [options] value 
 .SH DESCRIPTION
diff --git a/debian/lenny/tdelibs/debian/man/tdeconfig_compiler-trinity.1 b/debian/lenny/tdelibs/debian/man/tdeconfig_compiler-trinity.1
index cf8fa9f5c..788d0efe0 100644
--- a/debian/lenny/tdelibs/debian/man/tdeconfig_compiler-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/tdeconfig_compiler-trinity.1
@@ -9,7 +9,7 @@ tdeconfig_compiler
 .SH DESCRIPTION
 \fBtdeconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
 .br
-The generated source code contains a class based on \fBKConfigSkeleton\fP that provides an API to access the applications configuration data.
+The generated source code contains a class based on \fBTDEConfigSkeleton\fP that provides an API to access the applications configuration data.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control
index 4cf6183e2..c997d25b7 100644
--- a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/control
@@ -11,11 +11,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
 Breaks: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
 Conflicts: libcompizconfig-backend-tdeconfig-trinity
-Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project
+Description: TDEConfig [Trinity] Settings library for plugins - OpenCompositing Project
  The OpenCompositing Project brings 3D desktop visual effects that improve
  usability of the X Window System and provide increased productivity
  through plugins and themes contributed by the community giving a
  rich desktop experience.
  .
- This package contains the KConfig (Trinity) settings backend for
+ This package contains the TDEConfig (Trinity) settings backend for
  libcompizconfig.
diff --git a/debian/squeeze/libraries/python-trinity/debian/changelog b/debian/squeeze/libraries/python-trinity/debian/changelog
index 0c28cec76..6c46847ae 100644
--- a/debian/squeeze/libraries/python-trinity/debian/changelog
+++ b/debian/squeeze/libraries/python-trinity/debian/changelog
@@ -277,7 +277,7 @@ python-trinity (3.15.2+20060422-2) unstable; urgency=low
 python-trinity (3.15.2+20060422-1) unstable; urgency=low
 
   * New upstream release
-    * KConfigSkeleton works now (Closes: #310919)
+    * TDEConfigSkeleton works now (Closes: #310919)
     * KABC is included (Closes: #362443)
   * Depend on python2.x-sip4 instead of python2.x-sip4-qt3
   * Bump build-depends on sip4 to 4.4.2 and dependencies on PyQt to 3.16
diff --git a/debian/squeeze/tdebase/debian/man/kreadconfig-trinity.1 b/debian/squeeze/tdebase/debian/man/kreadconfig-trinity.1
index 5bd6f869c..30151e789 100644
--- a/debian/squeeze/tdebase/debian/man/kreadconfig-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/kreadconfig-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read KConfig entries"
+.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read TDEConfig entries"
 .SH NAME
 kreadconfig
-\- Read KConfig entries (for use in shell scripts)
+\- Read TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
 \fBkreadconfig\fP [Qt\-options] [KDE\-options] [options] 
 .SH DESCRIPTION
diff --git a/debian/squeeze/tdebase/debian/man/kwriteconfig-trinity.1 b/debian/squeeze/tdebase/debian/man/kwriteconfig-trinity.1
index c98ebd1d4..266bc5560 100644
--- a/debian/squeeze/tdebase/debian/man/kwriteconfig-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/kwriteconfig-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write KConfig entries"
+.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write TDEConfig entries"
 .SH NAME
 kwriteconfig
-\- Write KConfig entries (for use in shell scripts)
+\- Write TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
 \fBkwriteconfig\fP [Qt\-options] [KDE\-options] [options] value 
 .SH DESCRIPTION
diff --git a/debian/squeeze/tdelibs/debian/man/tdeconfig_compiler-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeconfig_compiler-trinity.1
index cf8fa9f5c..788d0efe0 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeconfig_compiler-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeconfig_compiler-trinity.1
@@ -9,7 +9,7 @@ tdeconfig_compiler
 .SH DESCRIPTION
 \fBtdeconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
 .br
-The generated source code contains a class based on \fBKConfigSkeleton\fP that provides an API to access the applications configuration data.
+The generated source code contains a class based on \fBTDEConfigSkeleton\fP that provides an API to access the applications configuration data.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/control b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/control
index 4cf6183e2..c997d25b7 100644
--- a/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/debian/wheezy/applications/compizconfig-backend-tdeconfig/debian/control
@@ -11,11 +11,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
 Breaks: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
 Conflicts: libcompizconfig-backend-tdeconfig-trinity
-Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project
+Description: TDEConfig [Trinity] Settings library for plugins - OpenCompositing Project
  The OpenCompositing Project brings 3D desktop visual effects that improve
  usability of the X Window System and provide increased productivity
  through plugins and themes contributed by the community giving a
  rich desktop experience.
  .
- This package contains the KConfig (Trinity) settings backend for
+ This package contains the TDEConfig (Trinity) settings backend for
  libcompizconfig.
diff --git a/debian/wheezy/libraries/python-trinity/debian/changelog b/debian/wheezy/libraries/python-trinity/debian/changelog
index 0c28cec76..6c46847ae 100644
--- a/debian/wheezy/libraries/python-trinity/debian/changelog
+++ b/debian/wheezy/libraries/python-trinity/debian/changelog
@@ -277,7 +277,7 @@ python-trinity (3.15.2+20060422-2) unstable; urgency=low
 python-trinity (3.15.2+20060422-1) unstable; urgency=low
 
   * New upstream release
-    * KConfigSkeleton works now (Closes: #310919)
+    * TDEConfigSkeleton works now (Closes: #310919)
     * KABC is included (Closes: #362443)
   * Depend on python2.x-sip4 instead of python2.x-sip4-qt3
   * Bump build-depends on sip4 to 4.4.2 and dependencies on PyQt to 3.16
diff --git a/debian/wheezy/tdebase/debian/man/kreadconfig-trinity.1 b/debian/wheezy/tdebase/debian/man/kreadconfig-trinity.1
index 5bd6f869c..30151e789 100644
--- a/debian/wheezy/tdebase/debian/man/kreadconfig-trinity.1
+++ b/debian/wheezy/tdebase/debian/man/kreadconfig-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read KConfig entries"
+.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read TDEConfig entries"
 .SH NAME
 kreadconfig
-\- Read KConfig entries (for use in shell scripts)
+\- Read TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
 \fBkreadconfig\fP [Qt\-options] [KDE\-options] [options] 
 .SH DESCRIPTION
diff --git a/debian/wheezy/tdebase/debian/man/kwriteconfig-trinity.1 b/debian/wheezy/tdebase/debian/man/kwriteconfig-trinity.1
index c98ebd1d4..266bc5560 100644
--- a/debian/wheezy/tdebase/debian/man/kwriteconfig-trinity.1
+++ b/debian/wheezy/tdebase/debian/man/kwriteconfig-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write KConfig entries"
+.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write TDEConfig entries"
 .SH NAME
 kwriteconfig
-\- Write KConfig entries (for use in shell scripts)
+\- Write TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
 \fBkwriteconfig\fP [Qt\-options] [KDE\-options] [options] value 
 .SH DESCRIPTION
diff --git a/debian/wheezy/tdelibs/debian/man/tdeconfig_compiler-trinity.1 b/debian/wheezy/tdelibs/debian/man/tdeconfig_compiler-trinity.1
index cf8fa9f5c..788d0efe0 100644
--- a/debian/wheezy/tdelibs/debian/man/tdeconfig_compiler-trinity.1
+++ b/debian/wheezy/tdelibs/debian/man/tdeconfig_compiler-trinity.1
@@ -9,7 +9,7 @@ tdeconfig_compiler
 .SH DESCRIPTION
 \fBtdeconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
 .br
-The generated source code contains a class based on \fBKConfigSkeleton\fP that provides an API to access the applications configuration data.
+The generated source code contains a class based on \fBTDEConfigSkeleton\fP that provides an API to access the applications configuration data.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
index 4cf6183e2..c997d25b7 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
@@ -11,11 +11,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
 Breaks: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
 Conflicts: libcompizconfig-backend-tdeconfig-trinity
-Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project
+Description: TDEConfig [Trinity] Settings library for plugins - OpenCompositing Project
  The OpenCompositing Project brings 3D desktop visual effects that improve
  usability of the X Window System and provide increased productivity
  through plugins and themes contributed by the community giving a
  rich desktop experience.
  .
- This package contains the KConfig (Trinity) settings backend for
+ This package contains the TDEConfig (Trinity) settings backend for
  libcompizconfig.
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/changelog b/ubuntu/maverick/libraries/python-trinity/debian/changelog
index 0c28cec76..6c46847ae 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/changelog
+++ b/ubuntu/maverick/libraries/python-trinity/debian/changelog
@@ -277,7 +277,7 @@ python-trinity (3.15.2+20060422-2) unstable; urgency=low
 python-trinity (3.15.2+20060422-1) unstable; urgency=low
 
   * New upstream release
-    * KConfigSkeleton works now (Closes: #310919)
+    * TDEConfigSkeleton works now (Closes: #310919)
     * KABC is included (Closes: #362443)
   * Depend on python2.x-sip4 instead of python2.x-sip4-qt3
   * Bump build-depends on sip4 to 4.4.2 and dependencies on PyQt to 3.16
diff --git a/ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1
index 5bd6f869c..30151e789 100644
--- a/ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read KConfig entries"
+.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read TDEConfig entries"
 .SH NAME
 kreadconfig
-\- Read KConfig entries (for use in shell scripts)
+\- Read TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
 \fBkreadconfig\fP [Qt\-options] [KDE\-options] [options] 
 .SH DESCRIPTION
diff --git a/ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1
index c98ebd1d4..266bc5560 100644
--- a/ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write KConfig entries"
+.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write TDEConfig entries"
 .SH NAME
 kwriteconfig
-\- Write KConfig entries (for use in shell scripts)
+\- Write TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
 \fBkwriteconfig\fP [Qt\-options] [KDE\-options] [options] value 
 .SH DESCRIPTION
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
index d99e8bf02..baeb8bfd5 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
@@ -4,8 +4,8 @@
  {
  	setCaption(i18n("Shutdown TDE"));
  
--	bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
-+	bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true);
+-	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
++	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true);
  
  	TQFrame* lfrm = new TQFrame( this );
  	TQHBoxLayout* hbuttonbox;
@@ -15,8 +15,8 @@
  							2 * KDialog::spacingHint() );
  
  	// default factor
--	bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
-+	bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true);
+-	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
++	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true);
  
  	// slighty more space for the new logout
  	int factor = 2;
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeconfig_compiler-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeconfig_compiler-trinity.1
index cf8fa9f5c..788d0efe0 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeconfig_compiler-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/tdeconfig_compiler-trinity.1
@@ -9,7 +9,7 @@ tdeconfig_compiler
 .SH DESCRIPTION
 \fBtdeconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
 .br
-The generated source code contains a class based on \fBKConfigSkeleton\fP that provides an API to access the applications configuration data.
+The generated source code contains a class based on \fBTDEConfigSkeleton\fP that provides an API to access the applications configuration data.
 .SH OPTIONS
 .SS
 .SS Arguments:
diff --git a/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control
index 4cf6183e2..c997d25b7 100644
--- a/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control
@@ -11,11 +11,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
 Breaks: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
 Conflicts: libcompizconfig-backend-tdeconfig-trinity
-Description: KConfig [Trinity] Settings library for plugins - OpenCompositing Project
+Description: TDEConfig [Trinity] Settings library for plugins - OpenCompositing Project
  The OpenCompositing Project brings 3D desktop visual effects that improve
  usability of the X Window System and provide increased productivity
  through plugins and themes contributed by the community giving a
  rich desktop experience.
  .
- This package contains the KConfig (Trinity) settings backend for
+ This package contains the TDEConfig (Trinity) settings backend for
  libcompizconfig.
diff --git a/ubuntu/precise/libraries/python-trinity/debian/changelog b/ubuntu/precise/libraries/python-trinity/debian/changelog
index 0c28cec76..6c46847ae 100644
--- a/ubuntu/precise/libraries/python-trinity/debian/changelog
+++ b/ubuntu/precise/libraries/python-trinity/debian/changelog
@@ -277,7 +277,7 @@ python-trinity (3.15.2+20060422-2) unstable; urgency=low
 python-trinity (3.15.2+20060422-1) unstable; urgency=low
 
   * New upstream release
-    * KConfigSkeleton works now (Closes: #310919)
+    * TDEConfigSkeleton works now (Closes: #310919)
     * KABC is included (Closes: #362443)
   * Depend on python2.x-sip4 instead of python2.x-sip4-qt3
   * Bump build-depends on sip4 to 4.4.2 and dependencies on PyQt to 3.16
diff --git a/ubuntu/precise/tdebase/debian/man/kreadconfig-trinity.1 b/ubuntu/precise/tdebase/debian/man/kreadconfig-trinity.1
index 5bd6f869c..30151e789 100644
--- a/ubuntu/precise/tdebase/debian/man/kreadconfig-trinity.1
+++ b/ubuntu/precise/tdebase/debian/man/kreadconfig-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read KConfig entries"
+.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read TDEConfig entries"
 .SH NAME
 kreadconfig
-\- Read KConfig entries (for use in shell scripts)
+\- Read TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
 \fBkreadconfig\fP [Qt\-options] [KDE\-options] [options] 
 .SH DESCRIPTION
diff --git a/ubuntu/precise/tdebase/debian/man/kwriteconfig-trinity.1 b/ubuntu/precise/tdebase/debian/man/kwriteconfig-trinity.1
index c98ebd1d4..266bc5560 100644
--- a/ubuntu/precise/tdebase/debian/man/kwriteconfig-trinity.1
+++ b/ubuntu/precise/tdebase/debian/man/kwriteconfig-trinity.1
@@ -1,8 +1,8 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write KConfig entries"
+.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write TDEConfig entries"
 .SH NAME
 kwriteconfig
-\- Write KConfig entries (for use in shell scripts)
+\- Write TDEConfig entries (for use in shell scripts)
 .SH SYNOPSIS
 \fBkwriteconfig\fP [Qt\-options] [KDE\-options] [options] value 
 .SH DESCRIPTION
diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
index d99e8bf02..baeb8bfd5 100644
--- a/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
+++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
@@ -4,8 +4,8 @@
  {
  	setCaption(i18n("Shutdown TDE"));
  
--	bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
-+	bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true);
+-	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
++	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true);
  
  	TQFrame* lfrm = new TQFrame( this );
  	TQHBoxLayout* hbuttonbox;
@@ -15,8 +15,8 @@
  							2 * KDialog::spacingHint() );
  
  	// default factor
--	bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
-+	bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true);
+-	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
++	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true);
  
  	// slighty more space for the new logout
  	int factor = 2;
diff --git a/ubuntu/precise/tdelibs/debian/man/tdeconfig_compiler-trinity.1 b/ubuntu/precise/tdelibs/debian/man/tdeconfig_compiler-trinity.1
index cf8fa9f5c..788d0efe0 100644
--- a/ubuntu/precise/tdelibs/debian/man/tdeconfig_compiler-trinity.1
+++ b/ubuntu/precise/tdelibs/debian/man/tdeconfig_compiler-trinity.1
@@ -9,7 +9,7 @@ tdeconfig_compiler
 .SH DESCRIPTION
 \fBtdeconfig_compiler\fP generates C++ source code from two files. The first file (.kcfg) contains information about configuration options and the second file (.kcfgc) provides the code generation options.
 .br
-The generated source code contains a class based on \fBKConfigSkeleton\fP that provides an API to access the applications configuration data.
+The generated source code contains a class based on \fBTDEConfigSkeleton\fP that provides an API to access the applications configuration data.
 .SH OPTIONS
 .SS
 .SS Arguments: