merge

14 files changed, 88 insertions, 88 deletions

diff --git a/ubuntu/maverick/tdebindings/debian/cdbs/versions.pl b/ubuntu/maverick/tdebindings/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/tdebindings/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/tdebindings/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@ my ($version2, $version2_next);
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control
index 0a425318d..c8b876984 100644
--- a/ubuntu/maverick/tdebindings/debian/control
+++ b/ubuntu/maverick/tdebindings/debian/control
@@ -29,10 +29,10 @@ Architecture: all
 Section: libs
 Replaces: libdcop3-java-kde3 (<< 4:14.0.0~), libdcop3-java-trinity (<< 4:14.0.0~)
 Breaks: libdcop3-java-kde3 (<< 4:14.0.0~), libdcop3-java-trinity (<< 4:14.0.0~)
-Depends: libdcop3-jni-trinity (>> ${KDE-Version3}~), libdcop3-jni-trinity (<< ${KDE-Next-Version3}~), gij | java1-runtime | java2-runtime
+Depends: libdcop3-jni-trinity (>> ${TDE-Version3}~), libdcop3-jni-trinity (<< ${TDE-Next-Version3}~), gij | java1-runtime | java2-runtime
 Description: DCOP bindings for Java [Trinity]
  This package contains the Java classes necessary to run Java programs
- using the Java DCOP bindings. DCOP is the TDE Desktop COmmunications
+ using the Java DCOP bindings. DCOP is the Trinity Desktop COmmunications
  Protocol, used for communicating with running TDE applications.
  .
  This package is part of the official TDE bindings module.
@@ -45,7 +45,7 @@ Breaks: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Description: DCOP bindings for Java ( Native libraries ) [Trinity]
  This package contains the shared libraries and scripts necessary to
- run programs using the Java DCOP bindings. DCOP is the TDE Desktop
+ run programs using the Java DCOP bindings. DCOP is the Trinity Desktop
  COmmunications Protocol, used for communicating with running TDE
  applications.
  .
@@ -56,11 +56,11 @@ Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libdevel
 Replaces: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~)
 Breaks: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~)
-Depends: libdcop3-java-trinity (>> ${KDE-Version3}~), libdcop3-java-trinity (<< ${KDE-Next-Version3}~)
+Depends: libdcop3-java-trinity (>> ${TDE-Version3}~), libdcop3-java-trinity (<< ${TDE-Next-Version3}~)
 Description: DCOP bindings for Java (dcopidl2java program) [Trinity]
  This package contains the dcopidl2java program which generates Java 
  stubs from DCOP IDL files, necessary to do development with the DCOP Java
- bindings. DCOP is the TDE Desktop COmmunications Protocol, used for
+ bindings. DCOP is the Trinity Desktop COmmunications Protocol, used for
  communicating with running TDE applications.
  .
  This package is part of the official TDE bindings module.
@@ -70,12 +70,12 @@ Architecture: all
 Section: libs
 Replaces: libqt3-java-kde3 (<< 4:14.0.0~), libqt3-java-trinity (<< 4:14.0.0~)
 Breaks: libqt3-java-kde3 (<< 4:14.0.0~), libqt3-java-trinity (<< 4:14.0.0~)
-Depends: libqt3-jni-trinity (>> ${KDE-Version3}~), libqt3-jni-trinity (<< ${KDE-Next-Version3}~), gij | java1-runtime | java2-runtime
+Depends: libqt3-jni-trinity (>> ${TDE-Version3}~), libqt3-jni-trinity (<< ${TDE-Next-Version3}~), gij | java1-runtime | java2-runtime
 Suggests: juic-trinity
 Description: Java bindings for Qt [Trinity]
  This package contains the Java classes necessary to run Java programs
  using the Java Qt bindings. Qt is a very popular GUI toolkit, used by
- the TDE desktop environment.
+ the Trinity desktop environment.
  .
  It also includes many example programs that make use of these bindings,
  plus many of the Qt Tutorial examples translated into Java.
@@ -91,7 +91,7 @@ Depends: ${shlibs:Depends}
 Description: Java bindings for Qt ( Native libraries ) [Trinity]
  This package contains the shared libraries necessary to run Java
  programs using the Java Qt bindings. Qt is a very popular GUI
- toolkit, used by the TDE desktop environment.
+ toolkit, used by the Trinity desktop environment.
  .
  This package is part of the official TDE bindings module.
 
@@ -100,7 +100,7 @@ Architecture: all
 Section: libs
 Replaces: libtrinity-java-kde3 (<< 4:14.0.0~), libtrinity-java-trinity (<< 4:14.0.0~)
 Breaks: libtrinity-java-kde3 (<< 4:14.0.0~), libtrinity-java-trinity (<< 4:14.0.0~)
-Depends: libtrinity-jni-trinity (>> ${KDE-Version3}~), libtrinity-jni-trinity (<< ${KDE-Next-Version3}~), gij | java1-runtime | java2-runtime
+Depends: libtrinity-jni-trinity (>> ${TDE-Version3}~), libtrinity-jni-trinity (<< ${TDE-Next-Version3}~), gij | java1-runtime | java2-runtime
 Description: tdelibs bindings for Java [Trinity]
  This package contains the Java classes necessary to run Java programs
  using the Java tdelibs bindings. TDE is the Trinity Desktop Environment, a
@@ -194,7 +194,7 @@ Provides: ${python:Provides}
 Description: DCOP bindings for Python
  This package contains the shared libraries necessary to run and
  develop Python programs using the Python DCOP bindings
- libraries. DCOP is the TDE Desktop COmmunications Protocol, used for
+ libraries. DCOP is the Trinity Desktop COmmunications Protocol, used for
  communicating with running TDE applications.
  .
  This package is part of the official TDE bindings module.
diff --git a/ubuntu/maverick/tdebindings/debian/control.in b/ubuntu/maverick/tdebindings/debian/control.in
index e889fa579..c772339b8 100644
--- a/ubuntu/maverick/tdebindings/debian/control.in
+++ b/ubuntu/maverick/tdebindings/debian/control.in
@@ -16,22 +16,22 @@ Package: tdebindings-java
 Section: libs
 Architecture: all
 Depends: libdcop3-java (= ${source:Version}), libqt3-java (= ${source:Version}), libtrinity-java (= ${source:Version})
-Description: KDE Java bindings metapackage
- A metapackage depending on all KDE, Qt and DCOP bindings libraries
+Description: TDE Java bindings metapackage
+ A metapackage depending on all TDE, Qt and DCOP bindings libraries
  related to the Java language.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libdcop3-java
 Architecture: all
 Section: libs
-Depends: libdcop3-jni (>> ${KDE-Version3}), libdcop3-jni (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
+Depends: libdcop3-jni (>> ${TDE-Version3}), libdcop3-jni (<< ${TDE-Next-Version3}), gij | java1-runtime | java2-runtime
 Description: DCOP bindings for Java
  This package contains the Java classes necessary to run Java programs
- using the Java DCOP bindings. DCOP is the KDE Desktop COmmunications
- Protocol, used for communicating with running KDE applications.
+ using the Java DCOP bindings. DCOP is the Trinity Desktop COmmunications
+ Protocol, used for communicating with running TDE applications.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libdcop3-jni
 Architecture: amd64 i386 ia64 powerpc s390 sparc
@@ -39,38 +39,38 @@ Section: libs
 Depends: ${shlibs:Depends}
 Description: DCOP bindings for Java ( Native libraries )
  This package contains the shared libraries and scripts necessary to
- run programs using the Java DCOP bindings. DCOP is the KDE Desktop
- COmmunications Protocol, used for communicating with running KDE
+ run programs using the Java DCOP bindings. DCOP is the Trinity Desktop
+ COmmunications Protocol, used for communicating with running TDE
  applications.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libdcop3-java-dev
 Architecture: amd64 i386 ia64 powerpc s390 sparc
 Section: libdevel
-Depends: libdcop3-java (>> ${KDE-Version3}), libdcop3-java (<< ${KDE-Next-Version3})
+Depends: libdcop3-java (>> ${TDE-Version3}), libdcop3-java (<< ${TDE-Next-Version3})
 Description: DCOP bindings for Java (dcopidl2java program)
  This package contains the dcopidl2java program which generates Java 
  stubs from DCOP IDL files, necessary to do development with the DCOP Java
- bindings. DCOP is the KDE Desktop COmmunications Protocol, used for
- communicating with running KDE applications.
+ bindings. DCOP is the Trinity Desktop COmmunications Protocol, used for
+ communicating with running TDE applications.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libqt3-java
 Architecture: all
 Section: libs
-Depends: libqt3-jni (>> ${KDE-Version3}), libqt3-jni (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
+Depends: libqt3-jni (>> ${TDE-Version3}), libqt3-jni (<< ${TDE-Next-Version3}), gij | java1-runtime | java2-runtime
 Suggests: juic
 Description: Java bindings for Qt
  This package contains the Java classes necessary to run Java programs
  using the Java Qt bindings. Qt is a very popular GUI toolkit, used by
- the KDE desktop environment.
+ the Trinity desktop environment.
  .
  It also includes many example programs that make use of these bindings,
  plus many of the Qt Tutorial examples translated into Java.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libqt3-jni
 Architecture: amd64 i386 ia64 powerpc s390 sparc
@@ -79,23 +79,23 @@ Depends: ${shlibs:Depends}
 Description: Java bindings for Qt ( Native libraries )
  This package contains the shared libraries necessary to run Java
  programs using the Java Qt bindings. Qt is a very popular GUI
- toolkit, used by the KDE desktop environment.
+ toolkit, used by the Trinity desktop environment.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libtrinity-java
 Architecture: all
 Section: libs
-Depends: libtrinity-jni (>> ${KDE-Version3}), libtrinity-jni (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
+Depends: libtrinity-jni (>> ${TDE-Version3}), libtrinity-jni (<< ${TDE-Next-Version3}), gij | java1-runtime | java2-runtime
 Description: tdelibs bindings for Java
  This package contains the Java classes necessary to run Java programs
- using the Java tdelibs bindings. KDE is the K Desktop Environment, a
+ using the Java tdelibs bindings. TDE is the Trinity Desktop Environment, a
  very popular UNIX Desktop Environment.
  .
  It also includes some example applications that use these Java
- classes, and multiple usage samples of the most common KDE classes.
+ classes, and multiple usage samples of the most common TDE classes.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libtrinity-jni
 Architecture: amd64 i386 ia64 powerpc s390 sparc
@@ -103,10 +103,10 @@ Section: libs
 Depends: ${shlibs:Depends}
 Description: tdelibs bindings for java ( Native libraries )
  This package contains the shared libraries necessary to run Java
- programs using the Java tdelibs bindings. KDE is the K Desktop
+ programs using the Java tdelibs bindings. TDE is the Trinity Desktop
  Environment, a very popular UNIX Desktop Environment.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libsmokeqt1
 Architecture: any
@@ -114,10 +114,10 @@ Section: libs
 Depends: ${shlibs:Depends}
 Description: SMOKE Binding Library to Qt
  The "Scripting Meta Object Kompiler Engine" library is used by
- various KDE language bindings packages to provide interfaces to the
+ various TDE language bindings packages to provide interfaces to the
  Qt library.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libsmokeqt-dev
 Architecture: any
@@ -125,40 +125,40 @@ Section: libdevel
 Depends: libsmokeqt1 (= ${binary:Version})
 Description: SMOKE Binding Library to Qt - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
- various KDE language bindings packages to provide interfaces to the
+ various TDE language bindings packages to provide interfaces to the
  Qt library. This package contains the development files for the
  library.
  .
  If you are a normal Debian user, you probably don't need this
  package.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
-Package: libsmokekde1
+Package: libsmoketde1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Description: SMOKE Binding Library to KDE
+Description: SMOKE Binding Library to TDE
  The "Scripting Meta Object Kompiler Engine" library is used by
- various KDE language bindings packages to provide interfaces to the
- KDE libraries.
+ various TDE language bindings packages to provide interfaces to the
+ TDE libraries.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
-Package: libsmokekde-dev
+Package: libsmoketde-dev
 Architecture: any
 Section: libdevel
-Depends: libsmokekde1 (= ${binary:Version})
-Description: SMOKE Binding Library to KDE - Development Files
+Depends: libsmoketde1 (= ${binary:Version})
+Description: SMOKE Binding Library to TDE - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
- various KDE language bindings packages to provide interfaces to the
- Qt and KDE libraries. This package contains the development files for
+ various TDE language bindings packages to provide interfaces to the
+ Qt and TDE libraries. This package contains the development files for
  the library.
  .
  If you are a normal Debian user, you probably don't need this
  package.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: python-dcop
 Architecture: any
@@ -170,10 +170,10 @@ Conflicts: dcoppython
 Description: DCOP bindings for Python
  This package contains the shared libraries necessary to run and
  develop Python programs using the Python DCOP bindings
- libraries. DCOP is the KDE Desktop COmmunications Protocol, used for
- communicating with running KDE applications.
+ libraries. DCOP is the Trinity Desktop COmmunications Protocol, used for
+ communicating with running TDE applications.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libkjsembed1
 Architecture: any
@@ -182,9 +182,9 @@ Depends: ${shlibs:Depends}
 Description: Embedded JavaScript library
  This package contains the shared libraries necessary to run programs
  linked with the KJSEmbed library. This library provides JavaScript
- embedded scripting facilities to KDE applications.
+ embedded scripting facilities to TDE applications.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libkjsembed-dev
 Architecture: any
@@ -193,23 +193,23 @@ Depends: libkjsembed1 (= ${binary:Version})
 Description: Embedded JavaScript library (Development files)
  This package contains the header files and symbolic links necessary
  to develop and compile programs using the KJSEmbed library. This
- library provides JavaScript embedded scripting facilities to KDE
+ library provides JavaScript embedded scripting facilities to TDE
  applications.
  .
  It also includes lots of example programs that make use of these
  bindings, plus comprehensive documentation of the bindings.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: kjscmd
 Architecture: any
 Section: interpreters
 Depends: ${shlibs:Depends}
-Description: A script interpreter using the KDE JavaScript library
+Description: A script interpreter using the TDE JavaScript library
  This package contains the kjscmd program, which is a standalone
  JavaScript interpreter using the KJSEmbed library.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: juic
 Architecture: all
@@ -224,20 +224,20 @@ Description: The Qt Java UI Compiler
  developing programs using the Qt Java bindings together with Qt
  Designer.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libkorundum0-ruby1.8
 Architecture: any
 Section: interpreters
 Depends: libqt0-ruby1.8 (= ${binary:Version}), ${shlibs:Depends}
-Description: KDE bindings for Ruby
+Description: TDE bindings for Ruby
  This package contains the files necessary for running and developing
- Ruby code using the Korundum KDE Ruby bindings.
+ Ruby code using the Korundum TDE Ruby bindings.
  .
  It also includes some example programs and templates that make use of
  these bindings.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
 
 Package: libqt0-ruby1.8
 Architecture: any
@@ -250,4 +250,4 @@ Description: Qt bindings for Ruby
  It also includes some example programs that make use of these bindings,
  plus many of the Qt Tutorial examples translated into Ruby.
  .
- This package is part of the official KDE bindings module.
+ This package is part of the official TDE bindings module.
diff --git a/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu b/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu
index 0e5402a75..be36546ba 100644
--- a/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu
+++ b/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu
@@ -1,4 +1,4 @@
-?package(kjscmd):\
+?package(kjscmd-trinity):\
 	needs="X11"\
 	section="Applications/Programming"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.README.Debian b/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.README.Debian
index bfba13c88..7db60302b 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.README.Debian
+++ b/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.README.Debian
@@ -26,7 +26,7 @@ should be completely similar to the Qt C++ API, so the standard Qt
 docs should translate pretty easily.  There are a lot of Qt Java usage
 examples in /usr/share/doc/libqt3-java/examples.
 
-If you're interested in developing KDE applications using Java, look
+If you're interested in developing TDE applications using Java, look
 at the libtrinity-java package.
 
 
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.README.Debian b/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.README.Debian
index 7b0f5a847..3b86843c2 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.README.Debian
+++ b/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.README.Debian
@@ -1,8 +1,8 @@
-Developing and using KDE based applications written in Java
+Developing and using TDE based applications written in Java
 ===========================================================
 
-This document explains how to develop and use KDE based programs
-written in Java.  This is what the KDE java bindings from the package
+This document explains how to develop and use TDE based programs
+written in Java.  This is what the TDE java bindings from the package
 libtrinity-java are designed to accomplish.
 
 Please read the document /usr/share/doc/libqt3-java/README.Debian.
diff --git a/ubuntu/maverick/tdebindings/debian/local/juic.1 b/ubuntu/maverick/tdebindings/debian/local/juic.1
index 08aba74f8..9120f44d3 100644
--- a/ubuntu/maverick/tdebindings/debian/local/juic.1
+++ b/ubuntu/maverick/tdebindings/debian/local/juic.1
@@ -1,4 +1,4 @@
-.TH JUIC 1 "Apr 2004" "K Desktop Environment" "Qt Java UI Compiler Manual"
+.TH JUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Java UI Compiler Manual"
 .SH NAME
 juic \- The Qt Java UI Compiler
 .SH SYNOPSIS
diff --git a/ubuntu/maverick/tdebindings/debian/local/krubyinit.1 b/ubuntu/maverick/tdebindings/debian/local/krubyinit.1
index cca53af30..f8a405452 100644
--- a/ubuntu/maverick/tdebindings/debian/local/krubyinit.1
+++ b/ubuntu/maverick/tdebindings/debian/local/krubyinit.1
@@ -1,4 +1,4 @@
-.TH KRUBYINIT 1 "Aug 2004" "K Desktop Environment" "KRubyInit Manual"
+.TH KRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "KRubyInit Manual"
 .SH NAME
 krubyinit \- Start Korundum Ruby Scripts Faster
 .SH SYNOPSYS
@@ -6,15 +6,15 @@ krubyinit \- Start Korundum Ruby Scripts Faster
 [switches] [--] [programfile] [arguments]
 .SH DESCRIPTION
 Krubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the Korundum library ( the Ruby KDE bindings ).  It uses
+scripts using the Korundum library ( the Ruby TDE bindings ).  It uses
 the tdeinit system to start the app so that they start a little bit
-faster when started in a running KDE session.
+faster when started in a running TDE session.
 
 The script takes exactly the same options as the ruby(1) program.
 Therefore, its options aren't documented here, please refer to the
 ruby(1) manpage.
 
-This script is part of Korundum, which is part of the KDE Bindings
+This script is part of Korundum, which is part of the TDE Bindings
 module.
 .SH OPTIONS
 Krubyinit takes exactly the same options as the ruby(1) program and
diff --git a/ubuntu/maverick/tdebindings/debian/local/qtrubyinit.1 b/ubuntu/maverick/tdebindings/debian/local/qtrubyinit.1
index 52b099b0e..1ab6e7f28 100644
--- a/ubuntu/maverick/tdebindings/debian/local/qtrubyinit.1
+++ b/ubuntu/maverick/tdebindings/debian/local/qtrubyinit.1
@@ -1,4 +1,4 @@
-.TH QTRUBYINIT 1 "Aug 2004" "K Desktop Environment" "QtRubyInit Manual"
+.TH QTRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "QtRubyInit Manual"
 .SH NAME
 qtrubyinit \- Start Qt Ruby Scripts Faster
 .SH SYNOPSYS
@@ -8,13 +8,13 @@ qtrubyinit \- Start Qt Ruby Scripts Faster
 Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby
 scripts using the QtRuby library.  It uses the tdeinit system to start
 the app so that they start a little bit faster when started in a
-running KDE session.
+running TDE session.
 
 The script takes exactly the same options as the ruby(1) program.
 Therefore, its options aren't documented here, please refer to the
 ruby(1) manpage.
 
-This script is part of QtRuby, which is part of the KDE Bindings
+This script is part of QtRuby, which is part of the TDE Bindings
 module.
 .SH OPTIONS
 Qtrubyinit takes exactly the same options as the ruby(1) program and
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbqtapi.1 b/ubuntu/maverick/tdebindings/debian/local/rbqtapi.1
index a72e4e991..7cafb5b8c 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbqtapi.1
+++ b/ubuntu/maverick/tdebindings/debian/local/rbqtapi.1
@@ -1,4 +1,4 @@
-.TH RBQTAPI 1 "Aug 2004" "K Desktop Environment" "Qt Ruby Bindings Manual"
+.TH RBQTAPI 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual"
 .SH NAME
 rbqtapi \- A QtRuby Introspection Tool
 .SH SYNOPSIS
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbqtsh.1 b/ubuntu/maverick/tdebindings/debian/local/rbqtsh.1
index 75b2bd575..bda49d962 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbqtsh.1
+++ b/ubuntu/maverick/tdebindings/debian/local/rbqtsh.1
@@ -1,4 +1,4 @@
-.TH RBQTSH 1 "Aug 2004" "K Desktop Environment" "Qt Ruby Bindings Manual"
+.TH RBQTSH 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual"
 .SH NAME
 rbqtsh \- An Interactive QtRuby Shell
 .SH SYNOPSIS
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbtdesh.1 b/ubuntu/maverick/tdebindings/debian/local/rbtdesh.1
index 84e240fc4..6e792e7fa 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbtdesh.1
+++ b/ubuntu/maverick/tdebindings/debian/local/rbtdesh.1
@@ -1,4 +1,4 @@
-.TH RBKDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
+.TH RBTDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
 .SH NAME
 rbtdesh \- An Interactive Korundum Shell
 .SH SYNOPSIS
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbuic.1 b/ubuntu/maverick/tdebindings/debian/local/rbuic.1
index 5191cd7b6..d59caa1ac 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbuic.1
+++ b/ubuntu/maverick/tdebindings/debian/local/rbuic.1
@@ -1,4 +1,4 @@
-.TH RBUIC 1 "Apr 2004" "K Desktop Environment" "Qt Ruby UI Compiler Manual"
+.TH RBUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Ruby UI Compiler Manual"
 .SH NAME
 rbuic \- The Qt Ruby UI Compiler
 .SH SYNOPSIS
@@ -44,7 +44,7 @@ Set the indent in spaces (0 to use a tab)
 Omit imports of custom widgets
 .TP
 .B \-kde
-Use kde widgets, require 'Korundum' extension
+Use TDE widgets, require 'Korundum' extension
 .TP
 .B \-tr <func>
 Use func(...) rather than trUtf8(...) for i18n
diff --git a/ubuntu/maverick/tdebindings/debian/rules b/ubuntu/maverick/tdebindings/debian/rules
index 98d509fa0..7f7315180 100755
--- a/ubuntu/maverick/tdebindings/debian/rules
+++ b/ubuntu/maverick/tdebindings/debian/rules
@@ -60,11 +60,11 @@ clean::
 	# Just in case
 	rm -f $(DEB_SRCDIR)/dcopjava/dcopidl2java/dcopidl2java
 	rm -f $(DEB_SRCDIR)/dcopjava/dcopidl2java/dcopidl2java.all_cpp.o
-	rm -f $(DEB_SRCDIR)/dcopjava/binding/org/kde/DCOP/*.class
+	rm -f $(DEB_SRCDIR)/dcopjava/binding/org/trinitydesktop/DCOP/*.class
 	rm -rf $(DEB_SRCDIR)/dcopjava/binding/.libs
 	rm -f dcopjava/binding/client.lo
 	rm -f dcopjava/binding/libjavadcop.la
-	rm -f dcopjava/binding/org_kde_DCOP_Client.h
+	rm -f dcopjava/binding/org_trinitydesktop_DCOP_Client.h
 	rm -f dcopjava/dcopidl2java/dcopidl2java.all_cpp.cpp
 	rm -f smoke/tde/qtdefines
 	rm -f smoke/tde/smokedata.cpp.diff