Update on Debian and Ubuntu according to recent renaming in tdebindings

126 files changed, 442 insertions, 430 deletions

diff --git a/debian/lenny/applications/amarok/debian/control b/debian/lenny/applications/amarok/debian/control
index 1498f9a55..91b1b2d95 100644
--- a/debian/lenny/applications/amarok/debian/control
+++ b/debian/lenny/applications/amarok/debian/control
@@ -22,7 +22,7 @@ Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trini
 Replaces: amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-trinity (<< 4:14.0.0~)
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
- python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
+ python, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
@@ -52,7 +52,7 @@ Depends: ruby
 Replaces: amarok-common-trinity (<< 4:14.0.0~)
 Breaks: amarok-common-trinity (<< 4:14.0.0~)
 Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby1.8-trinity, python, python-qt3
+Suggests: libqt0-ruby-trinity, python, python-tqt
 Description: architecture independent files for Amarok [Trinity]
  This package contains architecture independent files needed for Amarok to run
  properly. It also provides Amarok documentation. Therefore, unless you have
diff --git a/debian/lenny/applications/soundkonverter/debian/control b/debian/lenny/applications/soundkonverter/debian/control
index 43f0ff793..993d18f7a 100644
--- a/debian/lenny/applications/soundkonverter/debian/control
+++ b/debian/lenny/applications/soundkonverter/debian/control
@@ -33,7 +33,7 @@ Description: audio converter frontend for Trinity
 
 Package: soundkonverter-amarok-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity
+Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby-trinity
 Replaces: soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Breaks: soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Description: audio converter frontend for Trinity (Amarok script)
diff --git a/debian/lenny/tdebindings/debian/control b/debian/lenny/tdebindings/debian/control
index 9eac674ad..78bf5b062 100644
--- a/debian/lenny/tdebindings/debian/control
+++ b/debian/lenny/tdebindings/debian/control
@@ -258,12 +258,13 @@ Description: The Qt Java UI Compiler
  .
  This package is part of the official TDE bindings module.
 
-Package: libkorundum0-ruby1.8-trinity
+Package: libkorundum0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
-Depends: libqt0-ruby1.8-trinity (= ${binary:Version}), ${shlibs:Depends}
+Depends: libqt0-ruby-trinity (= ${binary:Version}), ${shlibs:Depends}
+Provides: libkorundum0-ruby1.8-trinity
 Description: TDE bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Korundum TDE Ruby bindings.
@@ -273,12 +274,13 @@ Description: TDE bindings for Ruby [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libqt0-ruby1.8-trinity
+Package: libqt0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Depends: ruby, ${shlibs:Depends}
+Provides: libqt0-ruby1.8-trinity
 Description: Qt bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Qt Ruby bindings.
diff --git a/debian/lenny/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs b/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.docs
index fcf01a118..fcf01a118 100644
--- a/debian/lenny/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs
+++ b/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.docs
diff --git a/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.install
index ebec44d37..c0da99000 100644
--- a/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.install
@@ -1,12 +1,12 @@
-debian/tmp/opt/trinity/bin/rbkdesh
-debian/tmp/opt/trinity/bin/rbkdeapi
+debian/tmp/opt/trinity/bin/rbtdesh
+debian/tmp/opt/trinity/bin/rbtdeapi
 debian/tmp/opt/trinity/bin/krubyinit
 debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
 
 debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb
-debian/tmp/opt/trinity/lib/ruby/*/KDE/korundum.rb
+debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
 
 debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so*
 debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la
 
-korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby1.8
+korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
diff --git a/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.manpages
new file mode 100644
index 000000000..ab2f0ee35
--- /dev/null
+++ b/debian/lenny/tdebindings/debian/libkorundum0-ruby-trinity.manpages
@@ -0,0 +1,3 @@
+debian/local/krubyinit.1
+debian/local/rbtdesh.1
+debian/local/rbtdeapi.1
diff --git a/debian/lenny/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/debian/lenny/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
deleted file mode 100644
index fba8f1a13..000000000
--- a/debian/lenny/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ /dev/null
@@ -1,12 +0,0 @@
-debian/tmp/opt/trinity/bin/rbkdesh
-debian/tmp/opt/trinity/bin/rbkdeapi
-debian/tmp/opt/trinity/bin/krubyinit
-debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
-
-debian/tmp/opt/trinity/lib/ruby/1.8/Korundum.rb
-debian/tmp/opt/trinity/lib/ruby/1.8/KDE/korundum.rb
-
-debian/tmp/opt/trinity/lib/ruby/1.8/*/korundum.so*
-debian/tmp/opt/trinity/lib/ruby/1.8/*/korundum.la
-
-korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby1.8
diff --git a/debian/lenny/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages b/debian/lenny/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
deleted file mode 100644
index 0dcb02444..000000000
--- a/debian/lenny/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/local/krubyinit.1
-debian/local/rbkdesh.1
-debian/local/rbkdeapi.1
diff --git a/debian/lenny/tdebindings/debian/libqt0-ruby1.8-trinity.docs b/debian/lenny/tdebindings/debian/libqt0-ruby-trinity.docs
index a6f9fffce..a6f9fffce 100644
--- a/debian/lenny/tdebindings/debian/libqt0-ruby1.8-trinity.docs
+++ b/debian/lenny/tdebindings/debian/libqt0-ruby-trinity.docs
diff --git a/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.install b/debian/lenny/tdebindings/debian/libqt0-ruby-trinity.install
index 2f075b24e..7ea7610b7 100644
--- a/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/debian/lenny/tdebindings/debian/libqt0-ruby-trinity.install
@@ -12,4 +12,4 @@ debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la
 debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so*
 debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la
 
-qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8
+qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
diff --git a/debian/lenny/tdebindings/debian/libqt0-ruby1.8-trinity.manpages b/debian/lenny/tdebindings/debian/libqt0-ruby-trinity.manpages
index f2dc6de31..f2dc6de31 100644
--- a/debian/lenny/tdebindings/debian/libqt0-ruby1.8-trinity.manpages
+++ b/debian/lenny/tdebindings/debian/libqt0-ruby-trinity.manpages
diff --git a/debian/lenny/tdebindings/debian/libqt0-ruby1.8-trinity.install b/debian/lenny/tdebindings/debian/libqt0-ruby1.8-trinity.install
deleted file mode 100644
index 60f10d40e..000000000
--- a/debian/lenny/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ /dev/null
@@ -1,15 +0,0 @@
-debian/tmp/opt/trinity/bin/rbqtsh
-debian/tmp/opt/trinity/bin/rbqtapi
-debian/tmp/opt/trinity/bin/rbuic
-debian/tmp/opt/trinity/bin/qtrubyinit
-
-debian/tmp/opt/trinity/lib/ruby/1.8/Qt/qtruby.rb
-debian/tmp/opt/trinity/lib/ruby/1.8/Qt.rb
-
-debian/tmp/opt/trinity/lib/ruby/1.8/*/qtruby.so*
-debian/tmp/opt/trinity/lib/ruby/1.8/*/qtruby.la
-
-debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.so*
-debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.la
-
-qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8
diff --git a/debian/lenny/tdebindings/debian/libtrinity-java-trinity.docs b/debian/lenny/tdebindings/debian/libtrinity-java-trinity.docs
index 6f113fce7..a2e63686d 100644
--- a/debian/lenny/tdebindings/debian/libtrinity-java-trinity.docs
+++ b/debian/lenny/tdebindings/debian/libtrinity-java-trinity.docs
@@ -1,2 +1,2 @@
-kdejava/koala/examples
-kdejava/koala/test
+tdejava/koala/examples
+tdejava/koala/test
diff --git a/debian/lenny/tdebindings/debian/libtrinity-jni-trinity.docs b/debian/lenny/tdebindings/debian/libtrinity-jni-trinity.docs
index 56222195b..6948746d5 100644
--- a/debian/lenny/tdebindings/debian/libtrinity-jni-trinity.docs
+++ b/debian/lenny/tdebindings/debian/libtrinity-jni-trinity.docs
@@ -1,4 +1,4 @@
-kdejava/AUTHORS
-kdejava/NEWS
-kdejava/README
-kdejava/TODO
+tdejava/AUTHORS
+tdejava/NEWS
+tdejava/README
+tdejava/TODO
diff --git a/debian/lenny/tdebindings/debian/libtrinity-jni-trinity.install b/debian/lenny/tdebindings/debian/libtrinity-jni-trinity.install
index 0c661dcee..e0450f12b 100644
--- a/debian/lenny/tdebindings/debian/libtrinity-jni-trinity.install
+++ b/debian/lenny/tdebindings/debian/libtrinity-jni-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1
-debian/tmp/opt/trinity/lib/jni/libkdejava.la
-debian/tmp/opt/trinity/lib/jni/libkdejava.so
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1.0.0
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1
+debian/tmp/opt/trinity/lib/jni/libtdejava.la
+debian/tmp/opt/trinity/lib/jni/libtdejava.so
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1.0.0
 
-kdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
+tdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
diff --git a/debian/lenny/tdebindings/debian/local/rbkdesh.1 b/debian/lenny/tdebindings/debian/local/rbkdesh.1
deleted file mode 100644
index 1fd7b6784..000000000
--- a/debian/lenny/tdebindings/debian/local/rbkdesh.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH RBKDESH 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
-.SH NAME
-rbkdesh \- An Interactive Korundum Shell
-.SH SYNOPSIS
-.B rbkdesh
-[options]
-.SH DESCRIPTION
-Rbkdesh is an interactive Korundum shell.  It shows a GUI dialog box
-where you can enter Ruby code using the Korundum KDE Ruby bindings
-library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbqtsh(1)
diff --git a/debian/lenny/tdebindings/debian/local/rbqtapi.1 b/debian/lenny/tdebindings/debian/local/rbqtapi.1
index e89b6f57d..a72e4e991 100644
--- a/debian/lenny/tdebindings/debian/local/rbqtapi.1
+++ b/debian/lenny/tdebindings/debian/local/rbqtapi.1
@@ -26,4 +26,4 @@ Print a help message.
 .SH AUTHOR
 Alexander Kellett
 .SH SEE ALSO
-rbkdeapi(1)
+rbtdeapi(1)
diff --git a/debian/lenny/tdebindings/debian/local/rbqtsh.1 b/debian/lenny/tdebindings/debian/local/rbqtsh.1
index dfa020d3d..75b2bd575 100644
--- a/debian/lenny/tdebindings/debian/local/rbqtsh.1
+++ b/debian/lenny/tdebindings/debian/local/rbqtsh.1
@@ -13,4 +13,4 @@ This program takes no options.
 Germain Garand
 Alexander Kellett
 .SH SEE ALSO
-rbkdesh(1)
+rbtdesh(1)
diff --git a/debian/lenny/tdebindings/debian/local/rbkdeapi.1 b/debian/lenny/tdebindings/debian/local/rbtdeapi.1
index ba6772436..e3d166225 100644
--- a/debian/lenny/tdebindings/debian/local/rbkdeapi.1
+++ b/debian/lenny/tdebindings/debian/local/rbtdeapi.1
@@ -1,11 +1,11 @@
-.TH RBKDEAPI 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
+.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
 .SH NAME
-rbkdeapi \- A Korundum KDE Ruby Introspection Tool
+rbtdeapi \- A Korundum TDE Ruby Introspection Tool
 .SH SYNOPSIS
-.B rbkdeapi
+.B rbtdeapi
 [options] [<class>]
 .SH DESCRIPTION
-Rbkdeapi is a Korundum KDE Ruby Introspection Tool, similar to
+Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to
 javap(1).  Use it to find a list of method for a certain Korundum class.
 .SH OPTIONS
 .TP 
diff --git a/debian/lenny/tdebindings/debian/local/rbtdesh.1 b/debian/lenny/tdebindings/debian/local/rbtdesh.1
new file mode 100644
index 000000000..84e240fc4
--- /dev/null
+++ b/debian/lenny/tdebindings/debian/local/rbtdesh.1
@@ -0,0 +1,17 @@
+.TH RBKDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
+.SH NAME
+rbtdesh \- An Interactive Korundum Shell
+.SH SYNOPSIS
+.B rbtdesh
+[options]
+.SH DESCRIPTION
+Rbtdesh is an interactive Korundum shell.  It shows a GUI dialog box
+where you can enter Ruby code using the Korundum TDE Ruby bindings
+library.
+.SH OPTIONS
+This program takes no options.
+.SH AUTHOR
+Germain Garand
+Alexander Kellett
+.SH SEE ALSO
+rbqtsh(1)
diff --git a/debian/lenny/tdebindings/debian/rules b/debian/lenny/tdebindings/debian/rules
index c31999f17..3f9af19fa 100755
--- a/debian/lenny/tdebindings/debian/rules
+++ b/debian/lenny/tdebindings/debian/rules
@@ -47,8 +47,8 @@ PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinit
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
-DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby1.8-trinity       = -n
-DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby1.8-trinity = -n
+DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby-trinity       = -n
+DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby-trinity = -n
 
 ###
 
@@ -127,10 +127,10 @@ binary-install/juic-trinity::
 binary-install/libdcop3-java-trinity-dev::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libkorundum0-ruby1.8-trinity::
+binary-install/libkorundum0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libqt0-ruby1.8-trinity::
+binary-install/libqt0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 binary-install/python-dcop-trinity::
diff --git a/debian/lenny/tdebindings/debian/tde-xparts-extras-trinity.install b/debian/lenny/tdebindings/debian/tde-xparts-extras-trinity.install
index 764c26e42..debb8165a 100644
--- a/debian/lenny/tdebindings/debian/tde-xparts-extras-trinity.install
+++ b/debian/lenny/tdebindings/debian/tde-xparts-extras-trinity.install
@@ -3,10 +3,10 @@
 #debian/tmp/opt/trinity/lib/libdcopc.so
 #debian/tmp/opt/trinity/lib/libdcopc.la
 #debian/tmp/opt/trinity/include/dcopc
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1.0.0
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1
-#debian/tmp/opt/trinity/lib/libkdexparts.so
-#debian/tmp/opt/trinity/lib/libkdexparts.la
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1.0.0
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1
+#debian/tmp/opt/trinity/lib/libtdexparts.so
+#debian/tmp/opt/trinity/lib/libtdexparts.la
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0.0.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so
diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control
index cb2097748..1912237f6 100644
--- a/debian/squeeze/applications/amarok/debian/control
+++ b/debian/squeeze/applications/amarok/debian/control
@@ -22,7 +22,7 @@ Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trini
 Replaces: amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-trinity (<< 4:14.0.0~)
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
- python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
+ python, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
@@ -52,7 +52,7 @@ Depends: ruby
 Replaces: amarok-common-trinity (<< 4:14.0.0~)
 Breaks: amarok-common-trinity (<< 4:14.0.0~)
 Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby1.8-trinity, python, python-qt3
+Suggests: libqt0-ruby-trinity, python, python-tqt
 Description: architecture independent files for Amarok [Trinity]
  This package contains architecture independent files needed for Amarok to run
  properly. It also provides Amarok documentation. Therefore, unless you have
diff --git a/debian/squeeze/applications/soundkonverter/debian/control b/debian/squeeze/applications/soundkonverter/debian/control
index 43f0ff793..993d18f7a 100644
--- a/debian/squeeze/applications/soundkonverter/debian/control
+++ b/debian/squeeze/applications/soundkonverter/debian/control
@@ -33,7 +33,7 @@ Description: audio converter frontend for Trinity
 
 Package: soundkonverter-amarok-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity
+Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby-trinity
 Replaces: soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Breaks: soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Description: audio converter frontend for Trinity (Amarok script)
diff --git a/debian/squeeze/tdebindings/debian/control b/debian/squeeze/tdebindings/debian/control
index 9eac674ad..78bf5b062 100644
--- a/debian/squeeze/tdebindings/debian/control
+++ b/debian/squeeze/tdebindings/debian/control
@@ -258,12 +258,13 @@ Description: The Qt Java UI Compiler
  .
  This package is part of the official TDE bindings module.
 
-Package: libkorundum0-ruby1.8-trinity
+Package: libkorundum0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
-Depends: libqt0-ruby1.8-trinity (= ${binary:Version}), ${shlibs:Depends}
+Depends: libqt0-ruby-trinity (= ${binary:Version}), ${shlibs:Depends}
+Provides: libkorundum0-ruby1.8-trinity
 Description: TDE bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Korundum TDE Ruby bindings.
@@ -273,12 +274,13 @@ Description: TDE bindings for Ruby [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libqt0-ruby1.8-trinity
+Package: libqt0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Depends: ruby, ${shlibs:Depends}
+Provides: libqt0-ruby1.8-trinity
 Description: Qt bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Qt Ruby bindings.
diff --git a/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs b/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.docs
index fcf01a118..fcf01a118 100644
--- a/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs
+++ b/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.docs
diff --git a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.install
index ebec44d37..c0da99000 100644
--- a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.install
@@ -1,12 +1,12 @@
-debian/tmp/opt/trinity/bin/rbkdesh
-debian/tmp/opt/trinity/bin/rbkdeapi
+debian/tmp/opt/trinity/bin/rbtdesh
+debian/tmp/opt/trinity/bin/rbtdeapi
 debian/tmp/opt/trinity/bin/krubyinit
 debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
 
 debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb
-debian/tmp/opt/trinity/lib/ruby/*/KDE/korundum.rb
+debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
 
 debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so*
 debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la
 
-korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby1.8
+korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
diff --git a/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.manpages
new file mode 100644
index 000000000..ab2f0ee35
--- /dev/null
+++ b/debian/squeeze/tdebindings/debian/libkorundum0-ruby-trinity.manpages
@@ -0,0 +1,3 @@
+debian/local/krubyinit.1
+debian/local/rbtdesh.1
+debian/local/rbtdeapi.1
diff --git a/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages b/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
deleted file mode 100644
index 0dcb02444..000000000
--- a/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/local/krubyinit.1
-debian/local/rbkdesh.1
-debian/local/rbkdeapi.1
diff --git a/debian/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.docs b/debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.docs
index a6f9fffce..a6f9fffce 100644
--- a/debian/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.docs
+++ b/debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.docs
diff --git a/debian/wheezy/tdebindings/debian/libqt0-ruby1.8-trinity.install b/debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.install
index 2f075b24e..7ea7610b7 100644
--- a/debian/wheezy/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.install
@@ -12,4 +12,4 @@ debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la
 debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so*
 debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la
 
-qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8
+qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
diff --git a/debian/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.manpages b/debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.manpages
index f2dc6de31..f2dc6de31 100644
--- a/debian/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.manpages
+++ b/debian/squeeze/tdebindings/debian/libqt0-ruby-trinity.manpages
diff --git a/debian/squeeze/tdebindings/debian/libtrinity-java-trinity.docs b/debian/squeeze/tdebindings/debian/libtrinity-java-trinity.docs
index 6f113fce7..a2e63686d 100644
--- a/debian/squeeze/tdebindings/debian/libtrinity-java-trinity.docs
+++ b/debian/squeeze/tdebindings/debian/libtrinity-java-trinity.docs
@@ -1,2 +1,2 @@
-kdejava/koala/examples
-kdejava/koala/test
+tdejava/koala/examples
+tdejava/koala/test
diff --git a/debian/squeeze/tdebindings/debian/libtrinity-jni-trinity.docs b/debian/squeeze/tdebindings/debian/libtrinity-jni-trinity.docs
index 56222195b..6948746d5 100644
--- a/debian/squeeze/tdebindings/debian/libtrinity-jni-trinity.docs
+++ b/debian/squeeze/tdebindings/debian/libtrinity-jni-trinity.docs
@@ -1,4 +1,4 @@
-kdejava/AUTHORS
-kdejava/NEWS
-kdejava/README
-kdejava/TODO
+tdejava/AUTHORS
+tdejava/NEWS
+tdejava/README
+tdejava/TODO
diff --git a/debian/squeeze/tdebindings/debian/libtrinity-jni-trinity.install b/debian/squeeze/tdebindings/debian/libtrinity-jni-trinity.install
index 0c661dcee..e0450f12b 100644
--- a/debian/squeeze/tdebindings/debian/libtrinity-jni-trinity.install
+++ b/debian/squeeze/tdebindings/debian/libtrinity-jni-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1
-debian/tmp/opt/trinity/lib/jni/libkdejava.la
-debian/tmp/opt/trinity/lib/jni/libkdejava.so
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1.0.0
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1
+debian/tmp/opt/trinity/lib/jni/libtdejava.la
+debian/tmp/opt/trinity/lib/jni/libtdejava.so
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1.0.0
 
-kdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
+tdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
diff --git a/debian/squeeze/tdebindings/debian/local/rbkdesh.1 b/debian/squeeze/tdebindings/debian/local/rbkdesh.1
deleted file mode 100644
index 1fd7b6784..000000000
--- a/debian/squeeze/tdebindings/debian/local/rbkdesh.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH RBKDESH 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
-.SH NAME
-rbkdesh \- An Interactive Korundum Shell
-.SH SYNOPSIS
-.B rbkdesh
-[options]
-.SH DESCRIPTION
-Rbkdesh is an interactive Korundum shell.  It shows a GUI dialog box
-where you can enter Ruby code using the Korundum KDE Ruby bindings
-library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbqtsh(1)
diff --git a/debian/squeeze/tdebindings/debian/local/rbqtapi.1 b/debian/squeeze/tdebindings/debian/local/rbqtapi.1
index e89b6f57d..a72e4e991 100644
--- a/debian/squeeze/tdebindings/debian/local/rbqtapi.1
+++ b/debian/squeeze/tdebindings/debian/local/rbqtapi.1
@@ -26,4 +26,4 @@ Print a help message.
 .SH AUTHOR
 Alexander Kellett
 .SH SEE ALSO
-rbkdeapi(1)
+rbtdeapi(1)
diff --git a/debian/squeeze/tdebindings/debian/local/rbqtsh.1 b/debian/squeeze/tdebindings/debian/local/rbqtsh.1
index dfa020d3d..75b2bd575 100644
--- a/debian/squeeze/tdebindings/debian/local/rbqtsh.1
+++ b/debian/squeeze/tdebindings/debian/local/rbqtsh.1
@@ -13,4 +13,4 @@ This program takes no options.
 Germain Garand
 Alexander Kellett
 .SH SEE ALSO
-rbkdesh(1)
+rbtdesh(1)
diff --git a/debian/wheezy/tdebindings/debian/local/rbkdeapi.1 b/debian/squeeze/tdebindings/debian/local/rbtdeapi.1
index ba6772436..e3d166225 100644
--- a/debian/wheezy/tdebindings/debian/local/rbkdeapi.1
+++ b/debian/squeeze/tdebindings/debian/local/rbtdeapi.1
@@ -1,11 +1,11 @@
-.TH RBKDEAPI 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
+.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
 .SH NAME
-rbkdeapi \- A Korundum KDE Ruby Introspection Tool
+rbtdeapi \- A Korundum TDE Ruby Introspection Tool
 .SH SYNOPSIS
-.B rbkdeapi
+.B rbtdeapi
 [options] [<class>]
 .SH DESCRIPTION
-Rbkdeapi is a Korundum KDE Ruby Introspection Tool, similar to
+Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to
 javap(1).  Use it to find a list of method for a certain Korundum class.
 .SH OPTIONS
 .TP 
diff --git a/debian/squeeze/tdebindings/debian/local/rbtdesh.1 b/debian/squeeze/tdebindings/debian/local/rbtdesh.1
new file mode 100644
index 000000000..84e240fc4
--- /dev/null
+++ b/debian/squeeze/tdebindings/debian/local/rbtdesh.1
@@ -0,0 +1,17 @@
+.TH RBKDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
+.SH NAME
+rbtdesh \- An Interactive Korundum Shell
+.SH SYNOPSIS
+.B rbtdesh
+[options]
+.SH DESCRIPTION
+Rbtdesh is an interactive Korundum shell.  It shows a GUI dialog box
+where you can enter Ruby code using the Korundum TDE Ruby bindings
+library.
+.SH OPTIONS
+This program takes no options.
+.SH AUTHOR
+Germain Garand
+Alexander Kellett
+.SH SEE ALSO
+rbqtsh(1)
diff --git a/debian/squeeze/tdebindings/debian/rules b/debian/squeeze/tdebindings/debian/rules
index dc53fba79..98d509fa0 100755
--- a/debian/squeeze/tdebindings/debian/rules
+++ b/debian/squeeze/tdebindings/debian/rules
@@ -47,8 +47,8 @@ PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinit
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
-DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby1.8-trinity       = -n
-DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby1.8-trinity = -n
+DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby-trinity       = -n
+DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby-trinity = -n
 
 ###
 
@@ -127,10 +127,10 @@ binary-install/juic-trinity::
 binary-install/libdcop3-java-trinity-dev::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libkorundum0-ruby1.8-trinity::
+binary-install/libkorundum0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libqt0-ruby1.8-trinity::
+binary-install/libqt0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 binary-install/python-dcop-trinity::
diff --git a/debian/squeeze/tdebindings/debian/tde-xparts-extras-trinity.install b/debian/squeeze/tdebindings/debian/tde-xparts-extras-trinity.install
index 764c26e42..debb8165a 100644
--- a/debian/squeeze/tdebindings/debian/tde-xparts-extras-trinity.install
+++ b/debian/squeeze/tdebindings/debian/tde-xparts-extras-trinity.install
@@ -3,10 +3,10 @@
 #debian/tmp/opt/trinity/lib/libdcopc.so
 #debian/tmp/opt/trinity/lib/libdcopc.la
 #debian/tmp/opt/trinity/include/dcopc
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1.0.0
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1
-#debian/tmp/opt/trinity/lib/libkdexparts.so
-#debian/tmp/opt/trinity/lib/libkdexparts.la
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1.0.0
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1
+#debian/tmp/opt/trinity/lib/libtdexparts.so
+#debian/tmp/opt/trinity/lib/libtdexparts.la
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0.0.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so
diff --git a/debian/wheezy/applications/amarok/debian/control b/debian/wheezy/applications/amarok/debian/control
index cb2097748..1912237f6 100644
--- a/debian/wheezy/applications/amarok/debian/control
+++ b/debian/wheezy/applications/amarok/debian/control
@@ -22,7 +22,7 @@ Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trini
 Replaces: amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-trinity (<< 4:14.0.0~)
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
- python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
+ python, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
@@ -52,7 +52,7 @@ Depends: ruby
 Replaces: amarok-common-trinity (<< 4:14.0.0~)
 Breaks: amarok-common-trinity (<< 4:14.0.0~)
 Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby1.8-trinity, python, python-qt3
+Suggests: libqt0-ruby-trinity, python, python-tqt
 Description: architecture independent files for Amarok [Trinity]
  This package contains architecture independent files needed for Amarok to run
  properly. It also provides Amarok documentation. Therefore, unless you have
diff --git a/debian/wheezy/applications/soundkonverter/debian/control b/debian/wheezy/applications/soundkonverter/debian/control
index 43f0ff793..993d18f7a 100644
--- a/debian/wheezy/applications/soundkonverter/debian/control
+++ b/debian/wheezy/applications/soundkonverter/debian/control
@@ -33,7 +33,7 @@ Description: audio converter frontend for Trinity
 
 Package: soundkonverter-amarok-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity
+Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby-trinity
 Replaces: soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Breaks: soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Description: audio converter frontend for Trinity (Amarok script)
diff --git a/debian/wheezy/tdebindings/debian/control b/debian/wheezy/tdebindings/debian/control
index 9eac674ad..78bf5b062 100644
--- a/debian/wheezy/tdebindings/debian/control
+++ b/debian/wheezy/tdebindings/debian/control
@@ -258,12 +258,13 @@ Description: The Qt Java UI Compiler
  .
  This package is part of the official TDE bindings module.
 
-Package: libkorundum0-ruby1.8-trinity
+Package: libkorundum0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
-Depends: libqt0-ruby1.8-trinity (= ${binary:Version}), ${shlibs:Depends}
+Depends: libqt0-ruby-trinity (= ${binary:Version}), ${shlibs:Depends}
+Provides: libkorundum0-ruby1.8-trinity
 Description: TDE bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Korundum TDE Ruby bindings.
@@ -273,12 +274,13 @@ Description: TDE bindings for Ruby [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libqt0-ruby1.8-trinity
+Package: libqt0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Depends: ruby, ${shlibs:Depends}
+Provides: libqt0-ruby1.8-trinity
 Description: Qt bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Qt Ruby bindings.
diff --git a/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs b/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.docs
index fcf01a118..fcf01a118 100644
--- a/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs
+++ b/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.docs
diff --git a/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.install
index ebec44d37..c0da99000 100644
--- a/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.install
@@ -1,12 +1,12 @@
-debian/tmp/opt/trinity/bin/rbkdesh
-debian/tmp/opt/trinity/bin/rbkdeapi
+debian/tmp/opt/trinity/bin/rbtdesh
+debian/tmp/opt/trinity/bin/rbtdeapi
 debian/tmp/opt/trinity/bin/krubyinit
 debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
 
 debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb
-debian/tmp/opt/trinity/lib/ruby/*/KDE/korundum.rb
+debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
 
 debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so*
 debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la
 
-korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby1.8
+korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
diff --git a/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.manpages
new file mode 100644
index 000000000..ab2f0ee35
--- /dev/null
+++ b/debian/wheezy/tdebindings/debian/libkorundum0-ruby-trinity.manpages
@@ -0,0 +1,3 @@
+debian/local/krubyinit.1
+debian/local/rbtdesh.1
+debian/local/rbtdeapi.1
diff --git a/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages b/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
deleted file mode 100644
index 0dcb02444..000000000
--- a/debian/wheezy/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/local/krubyinit.1
-debian/local/rbkdesh.1
-debian/local/rbkdeapi.1
diff --git a/debian/wheezy/tdebindings/debian/libqt0-ruby1.8-trinity.docs b/debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.docs
index a6f9fffce..a6f9fffce 100644
--- a/debian/wheezy/tdebindings/debian/libqt0-ruby1.8-trinity.docs
+++ b/debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install b/debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.install
index 2f075b24e..7ea7610b7 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.install
@@ -12,4 +12,4 @@ debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la
 debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so*
 debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la
 
-qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8
+qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
diff --git a/debian/wheezy/tdebindings/debian/libqt0-ruby1.8-trinity.manpages b/debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.manpages
index f2dc6de31..f2dc6de31 100644
--- a/debian/wheezy/tdebindings/debian/libqt0-ruby1.8-trinity.manpages
+++ b/debian/wheezy/tdebindings/debian/libqt0-ruby-trinity.manpages
diff --git a/debian/wheezy/tdebindings/debian/libtrinity-java-trinity.docs b/debian/wheezy/tdebindings/debian/libtrinity-java-trinity.docs
index 6f113fce7..a2e63686d 100644
--- a/debian/wheezy/tdebindings/debian/libtrinity-java-trinity.docs
+++ b/debian/wheezy/tdebindings/debian/libtrinity-java-trinity.docs
@@ -1,2 +1,2 @@
-kdejava/koala/examples
-kdejava/koala/test
+tdejava/koala/examples
+tdejava/koala/test
diff --git a/debian/wheezy/tdebindings/debian/libtrinity-jni-trinity.docs b/debian/wheezy/tdebindings/debian/libtrinity-jni-trinity.docs
index 56222195b..6948746d5 100644
--- a/debian/wheezy/tdebindings/debian/libtrinity-jni-trinity.docs
+++ b/debian/wheezy/tdebindings/debian/libtrinity-jni-trinity.docs
@@ -1,4 +1,4 @@
-kdejava/AUTHORS
-kdejava/NEWS
-kdejava/README
-kdejava/TODO
+tdejava/AUTHORS
+tdejava/NEWS
+tdejava/README
+tdejava/TODO
diff --git a/debian/wheezy/tdebindings/debian/libtrinity-jni-trinity.install b/debian/wheezy/tdebindings/debian/libtrinity-jni-trinity.install
index 0c661dcee..e0450f12b 100644
--- a/debian/wheezy/tdebindings/debian/libtrinity-jni-trinity.install
+++ b/debian/wheezy/tdebindings/debian/libtrinity-jni-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1
-debian/tmp/opt/trinity/lib/jni/libkdejava.la
-debian/tmp/opt/trinity/lib/jni/libkdejava.so
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1.0.0
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1
+debian/tmp/opt/trinity/lib/jni/libtdejava.la
+debian/tmp/opt/trinity/lib/jni/libtdejava.so
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1.0.0
 
-kdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
+tdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
diff --git a/debian/wheezy/tdebindings/debian/local/rbkdesh.1 b/debian/wheezy/tdebindings/debian/local/rbkdesh.1
deleted file mode 100644
index 1fd7b6784..000000000
--- a/debian/wheezy/tdebindings/debian/local/rbkdesh.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH RBKDESH 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
-.SH NAME
-rbkdesh \- An Interactive Korundum Shell
-.SH SYNOPSIS
-.B rbkdesh
-[options]
-.SH DESCRIPTION
-Rbkdesh is an interactive Korundum shell.  It shows a GUI dialog box
-where you can enter Ruby code using the Korundum KDE Ruby bindings
-library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbqtsh(1)
diff --git a/debian/wheezy/tdebindings/debian/local/rbqtapi.1 b/debian/wheezy/tdebindings/debian/local/rbqtapi.1
index e89b6f57d..a72e4e991 100644
--- a/debian/wheezy/tdebindings/debian/local/rbqtapi.1
+++ b/debian/wheezy/tdebindings/debian/local/rbqtapi.1
@@ -26,4 +26,4 @@ Print a help message.
 .SH AUTHOR
 Alexander Kellett
 .SH SEE ALSO
-rbkdeapi(1)
+rbtdeapi(1)
diff --git a/debian/wheezy/tdebindings/debian/local/rbqtsh.1 b/debian/wheezy/tdebindings/debian/local/rbqtsh.1
index dfa020d3d..75b2bd575 100644
--- a/debian/wheezy/tdebindings/debian/local/rbqtsh.1
+++ b/debian/wheezy/tdebindings/debian/local/rbqtsh.1
@@ -13,4 +13,4 @@ This program takes no options.
 Germain Garand
 Alexander Kellett
 .SH SEE ALSO
-rbkdesh(1)
+rbtdesh(1)
diff --git a/debian/squeeze/tdebindings/debian/local/rbkdeapi.1 b/debian/wheezy/tdebindings/debian/local/rbtdeapi.1
index ba6772436..e3d166225 100644
--- a/debian/squeeze/tdebindings/debian/local/rbkdeapi.1
+++ b/debian/wheezy/tdebindings/debian/local/rbtdeapi.1
@@ -1,11 +1,11 @@
-.TH RBKDEAPI 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
+.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
 .SH NAME
-rbkdeapi \- A Korundum KDE Ruby Introspection Tool
+rbtdeapi \- A Korundum TDE Ruby Introspection Tool
 .SH SYNOPSIS
-.B rbkdeapi
+.B rbtdeapi
 [options] [<class>]
 .SH DESCRIPTION
-Rbkdeapi is a Korundum KDE Ruby Introspection Tool, similar to
+Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to
 javap(1).  Use it to find a list of method for a certain Korundum class.
 .SH OPTIONS
 .TP 
diff --git a/debian/wheezy/tdebindings/debian/local/rbtdesh.1 b/debian/wheezy/tdebindings/debian/local/rbtdesh.1
new file mode 100644
index 000000000..84e240fc4
--- /dev/null
+++ b/debian/wheezy/tdebindings/debian/local/rbtdesh.1
@@ -0,0 +1,17 @@
+.TH RBKDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
+.SH NAME
+rbtdesh \- An Interactive Korundum Shell
+.SH SYNOPSIS
+.B rbtdesh
+[options]
+.SH DESCRIPTION
+Rbtdesh is an interactive Korundum shell.  It shows a GUI dialog box
+where you can enter Ruby code using the Korundum TDE Ruby bindings
+library.
+.SH OPTIONS
+This program takes no options.
+.SH AUTHOR
+Germain Garand
+Alexander Kellett
+.SH SEE ALSO
+rbqtsh(1)
diff --git a/debian/wheezy/tdebindings/debian/rules b/debian/wheezy/tdebindings/debian/rules
index dc53fba79..98d509fa0 100755
--- a/debian/wheezy/tdebindings/debian/rules
+++ b/debian/wheezy/tdebindings/debian/rules
@@ -47,8 +47,8 @@ PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinit
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
-DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby1.8-trinity       = -n
-DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby1.8-trinity = -n
+DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby-trinity       = -n
+DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby-trinity = -n
 
 ###
 
@@ -127,10 +127,10 @@ binary-install/juic-trinity::
 binary-install/libdcop3-java-trinity-dev::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libkorundum0-ruby1.8-trinity::
+binary-install/libkorundum0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libqt0-ruby1.8-trinity::
+binary-install/libqt0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 binary-install/python-dcop-trinity::
diff --git a/debian/wheezy/tdebindings/debian/tde-xparts-extras-trinity.install b/debian/wheezy/tdebindings/debian/tde-xparts-extras-trinity.install
index 764c26e42..debb8165a 100644
--- a/debian/wheezy/tdebindings/debian/tde-xparts-extras-trinity.install
+++ b/debian/wheezy/tdebindings/debian/tde-xparts-extras-trinity.install
@@ -3,10 +3,10 @@
 #debian/tmp/opt/trinity/lib/libdcopc.so
 #debian/tmp/opt/trinity/lib/libdcopc.la
 #debian/tmp/opt/trinity/include/dcopc
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1.0.0
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1
-#debian/tmp/opt/trinity/lib/libkdexparts.so
-#debian/tmp/opt/trinity/lib/libkdexparts.la
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1.0.0
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1
+#debian/tmp/opt/trinity/lib/libtdexparts.so
+#debian/tmp/opt/trinity/lib/libtdexparts.la
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0.0.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so
diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control
index 736d76a5b..ec278fc18 100644
--- a/ubuntu/maverick/applications/amarok/debian/control
+++ b/ubuntu/maverick/applications/amarok/debian/control
@@ -22,7 +22,7 @@ Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trini
 Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
- python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
+ python, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
@@ -52,7 +52,7 @@ Depends: ruby
 Replaces: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
 Breaks: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
 Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby1.8-trinity, python, python-qt3
+Suggests: libqt0-ruby-trinity, python, python-tqt
 Description: architecture independent files for Amarok [Trinity]
  This package contains architecture independent files needed for Amarok to run
  properly. It also provides Amarok documentation. Therefore, unless you have
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/control b/ubuntu/maverick/applications/soundkonverter/debian/control
index f322727a3..a3c6c1e05 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/control
+++ b/ubuntu/maverick/applications/soundkonverter/debian/control
@@ -33,7 +33,7 @@ Description: audio converter frontend for Trinity
 
 Package: soundkonverter-amarok-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity
+Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby-trinity
 Replaces: soundkonverter-amarok-kde3 (<< 4:14.0.0~), soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Breaks: soundkonverter-amarok-kde3 (<< 4:14.0.0~), soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Description: audio converter frontend for Trinity (Amarok script)
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control
index 717572811..9660f943a 100644
--- a/ubuntu/maverick/tdebindings/debian/control
+++ b/ubuntu/maverick/tdebindings/debian/control
@@ -258,12 +258,13 @@ Description: The Qt Java UI Compiler
  .
  This package is part of the official TDE bindings module.
 
-Package: libkorundum0-ruby1.8-trinity
+Package: libkorundum0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libkorundum0-ruby1.8-kde3 (<< 4:14.0.0~), libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libkorundum0-ruby1.8-kde3 (<< 4:14.0.0~), libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
-Depends: libqt0-ruby1.8-trinity (= ${binary:Version}), ${shlibs:Depends}
+Depends: libqt0-ruby-trinity (= ${binary:Version}), ${shlibs:Depends}
+Provides: libkorundum0-ruby1.8-trinity
 Description: TDE bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Korundum TDE Ruby bindings.
@@ -273,12 +274,13 @@ Description: TDE bindings for Ruby [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libqt0-ruby1.8-trinity
+Package: libqt0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libqt0-ruby1.8-kde3 (<< 4:14.0.0~), libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libqt0-ruby1.8-kde3 (<< 4:14.0.0~), libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Depends: ruby, ${shlibs:Depends}
+Provides: libqt0-ruby1.8-trinity
 Description: Qt bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Qt Ruby bindings.
diff --git a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs b/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.docs
index fcf01a118..fcf01a118 100644
--- a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs
+++ b/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.install
index ebec44d37..c0da99000 100644
--- a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.install
@@ -1,12 +1,12 @@
-debian/tmp/opt/trinity/bin/rbkdesh
-debian/tmp/opt/trinity/bin/rbkdeapi
+debian/tmp/opt/trinity/bin/rbtdesh
+debian/tmp/opt/trinity/bin/rbtdeapi
 debian/tmp/opt/trinity/bin/krubyinit
 debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
 
 debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb
-debian/tmp/opt/trinity/lib/ruby/*/KDE/korundum.rb
+debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
 
 debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so*
 debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la
 
-korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby1.8
+korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
diff --git a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.manpages
new file mode 100644
index 000000000..ab2f0ee35
--- /dev/null
+++ b/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.manpages
@@ -0,0 +1,3 @@
+debian/local/krubyinit.1
+debian/local/rbtdesh.1
+debian/local/rbtdeapi.1
diff --git a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages b/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
deleted file mode 100644
index 0dcb02444..000000000
--- a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/local/krubyinit.1
-debian/local/rbkdesh.1
-debian/local/rbkdeapi.1
diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.docs b/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.docs
index a6f9fffce..a6f9fffce 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.docs
+++ b/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.docs
diff --git a/debian/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.install
index 2f075b24e..7ea7610b7 100644
--- a/debian/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.install
@@ -12,4 +12,4 @@ debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la
 debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so*
 debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la
 
-qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8
+qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.manpages b/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.manpages
index f2dc6de31..f2dc6de31 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.manpages
+++ b/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.manpages
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.docs b/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.docs
index 6f113fce7..a2e63686d 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.docs
+++ b/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.docs
@@ -1,2 +1,2 @@
-kdejava/koala/examples
-kdejava/koala/test
+tdejava/koala/examples
+tdejava/koala/test
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.docs b/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.docs
index 56222195b..6948746d5 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.docs
+++ b/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.docs
@@ -1,4 +1,4 @@
-kdejava/AUTHORS
-kdejava/NEWS
-kdejava/README
-kdejava/TODO
+tdejava/AUTHORS
+tdejava/NEWS
+tdejava/README
+tdejava/TODO
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.install b/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.install
index 0c661dcee..e0450f12b 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.install
+++ b/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1
-debian/tmp/opt/trinity/lib/jni/libkdejava.la
-debian/tmp/opt/trinity/lib/jni/libkdejava.so
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1.0.0
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1
+debian/tmp/opt/trinity/lib/jni/libtdejava.la
+debian/tmp/opt/trinity/lib/jni/libtdejava.so
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1.0.0
 
-kdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
+tdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbkdesh.1 b/ubuntu/maverick/tdebindings/debian/local/rbkdesh.1
deleted file mode 100644
index 1fd7b6784..000000000
--- a/ubuntu/maverick/tdebindings/debian/local/rbkdesh.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH RBKDESH 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
-.SH NAME
-rbkdesh \- An Interactive Korundum Shell
-.SH SYNOPSIS
-.B rbkdesh
-[options]
-.SH DESCRIPTION
-Rbkdesh is an interactive Korundum shell.  It shows a GUI dialog box
-where you can enter Ruby code using the Korundum KDE Ruby bindings
-library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbqtsh(1)
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbqtapi.1 b/ubuntu/maverick/tdebindings/debian/local/rbqtapi.1
index e89b6f57d..a72e4e991 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbqtapi.1
+++ b/ubuntu/maverick/tdebindings/debian/local/rbqtapi.1
@@ -26,4 +26,4 @@ Print a help message.
 .SH AUTHOR
 Alexander Kellett
 .SH SEE ALSO
-rbkdeapi(1)
+rbtdeapi(1)
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbqtsh.1 b/ubuntu/maverick/tdebindings/debian/local/rbqtsh.1
index dfa020d3d..75b2bd575 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbqtsh.1
+++ b/ubuntu/maverick/tdebindings/debian/local/rbqtsh.1
@@ -13,4 +13,4 @@ This program takes no options.
 Germain Garand
 Alexander Kellett
 .SH SEE ALSO
-rbkdesh(1)
+rbtdesh(1)
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbkdeapi.1 b/ubuntu/maverick/tdebindings/debian/local/rbtdeapi.1
index ba6772436..e3d166225 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbkdeapi.1
+++ b/ubuntu/maverick/tdebindings/debian/local/rbtdeapi.1
@@ -1,11 +1,11 @@
-.TH RBKDEAPI 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
+.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
 .SH NAME
-rbkdeapi \- A Korundum KDE Ruby Introspection Tool
+rbtdeapi \- A Korundum TDE Ruby Introspection Tool
 .SH SYNOPSIS
-.B rbkdeapi
+.B rbtdeapi
 [options] [<class>]
 .SH DESCRIPTION
-Rbkdeapi is a Korundum KDE Ruby Introspection Tool, similar to
+Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to
 javap(1).  Use it to find a list of method for a certain Korundum class.
 .SH OPTIONS
 .TP 
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbtdesh.1 b/ubuntu/maverick/tdebindings/debian/local/rbtdesh.1
new file mode 100644
index 000000000..84e240fc4
--- /dev/null
+++ b/ubuntu/maverick/tdebindings/debian/local/rbtdesh.1
@@ -0,0 +1,17 @@
+.TH RBKDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
+.SH NAME
+rbtdesh \- An Interactive Korundum Shell
+.SH SYNOPSIS
+.B rbtdesh
+[options]
+.SH DESCRIPTION
+Rbtdesh is an interactive Korundum shell.  It shows a GUI dialog box
+where you can enter Ruby code using the Korundum TDE Ruby bindings
+library.
+.SH OPTIONS
+This program takes no options.
+.SH AUTHOR
+Germain Garand
+Alexander Kellett
+.SH SEE ALSO
+rbqtsh(1)
diff --git a/ubuntu/maverick/tdebindings/debian/rules b/ubuntu/maverick/tdebindings/debian/rules
index dc53fba79..98d509fa0 100755
--- a/ubuntu/maverick/tdebindings/debian/rules
+++ b/ubuntu/maverick/tdebindings/debian/rules
@@ -47,8 +47,8 @@ PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinit
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
-DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby1.8-trinity       = -n
-DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby1.8-trinity = -n
+DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby-trinity       = -n
+DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby-trinity = -n
 
 ###
 
@@ -127,10 +127,10 @@ binary-install/juic-trinity::
 binary-install/libdcop3-java-trinity-dev::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libkorundum0-ruby1.8-trinity::
+binary-install/libkorundum0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libqt0-ruby1.8-trinity::
+binary-install/libqt0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 binary-install/python-dcop-trinity::
diff --git a/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install b/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install
index 764c26e42..debb8165a 100644
--- a/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install
+++ b/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install
@@ -3,10 +3,10 @@
 #debian/tmp/opt/trinity/lib/libdcopc.so
 #debian/tmp/opt/trinity/lib/libdcopc.la
 #debian/tmp/opt/trinity/include/dcopc
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1.0.0
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1
-#debian/tmp/opt/trinity/lib/libkdexparts.so
-#debian/tmp/opt/trinity/lib/libkdexparts.la
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1.0.0
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1
+#debian/tmp/opt/trinity/lib/libtdexparts.so
+#debian/tmp/opt/trinity/lib/libtdexparts.la
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0.0.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so
diff --git a/ubuntu/precise/applications/amarok/debian/control b/ubuntu/precise/applications/amarok/debian/control
index 736d76a5b..ec278fc18 100644
--- a/ubuntu/precise/applications/amarok/debian/control
+++ b/ubuntu/precise/applications/amarok/debian/control
@@ -22,7 +22,7 @@ Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trini
 Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
- python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
+ python, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
@@ -52,7 +52,7 @@ Depends: ruby
 Replaces: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
 Breaks: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
 Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby1.8-trinity, python, python-qt3
+Suggests: libqt0-ruby-trinity, python, python-tqt
 Description: architecture independent files for Amarok [Trinity]
  This package contains architecture independent files needed for Amarok to run
  properly. It also provides Amarok documentation. Therefore, unless you have
diff --git a/ubuntu/precise/applications/soundkonverter/debian/control b/ubuntu/precise/applications/soundkonverter/debian/control
index f322727a3..a3c6c1e05 100644
--- a/ubuntu/precise/applications/soundkonverter/debian/control
+++ b/ubuntu/precise/applications/soundkonverter/debian/control
@@ -33,7 +33,7 @@ Description: audio converter frontend for Trinity
 
 Package: soundkonverter-amarok-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity
+Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby-trinity
 Replaces: soundkonverter-amarok-kde3 (<< 4:14.0.0~), soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Breaks: soundkonverter-amarok-kde3 (<< 4:14.0.0~), soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Description: audio converter frontend for Trinity (Amarok script)
diff --git a/ubuntu/precise/tdebindings/debian/control b/ubuntu/precise/tdebindings/debian/control
index 717572811..9660f943a 100644
--- a/ubuntu/precise/tdebindings/debian/control
+++ b/ubuntu/precise/tdebindings/debian/control
@@ -258,12 +258,13 @@ Description: The Qt Java UI Compiler
  .
  This package is part of the official TDE bindings module.
 
-Package: libkorundum0-ruby1.8-trinity
+Package: libkorundum0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libkorundum0-ruby1.8-kde3 (<< 4:14.0.0~), libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libkorundum0-ruby1.8-kde3 (<< 4:14.0.0~), libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
-Depends: libqt0-ruby1.8-trinity (= ${binary:Version}), ${shlibs:Depends}
+Depends: libqt0-ruby-trinity (= ${binary:Version}), ${shlibs:Depends}
+Provides: libkorundum0-ruby1.8-trinity
 Description: TDE bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Korundum TDE Ruby bindings.
@@ -273,12 +274,13 @@ Description: TDE bindings for Ruby [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libqt0-ruby1.8-trinity
+Package: libqt0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libqt0-ruby1.8-kde3 (<< 4:14.0.0~), libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libqt0-ruby1.8-kde3 (<< 4:14.0.0~), libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Depends: ruby, ${shlibs:Depends}
+Provides: libqt0-ruby1.8-trinity
 Description: Qt bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Qt Ruby bindings.
diff --git a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.docs
index fcf01a118..fcf01a118 100644
--- a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs
+++ b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.docs
diff --git a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.install b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.install
new file mode 100644
index 000000000..c0da99000
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.install
@@ -0,0 +1,12 @@
+debian/tmp/opt/trinity/bin/rbtdesh
+debian/tmp/opt/trinity/bin/rbtdeapi
+debian/tmp/opt/trinity/bin/krubyinit
+debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
+
+debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb
+debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
+
+debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so*
+debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la
+
+korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
diff --git a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.manpages
new file mode 100644
index 000000000..ab2f0ee35
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby-trinity.manpages
@@ -0,0 +1,3 @@
+debian/local/krubyinit.1
+debian/local/rbtdesh.1
+debian/local/rbtdeapi.1
diff --git a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
deleted file mode 100644
index 0dcb02444..000000000
--- a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/local/krubyinit.1
-debian/local/rbkdesh.1
-debian/local/rbkdeapi.1
diff --git a/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.docs b/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.docs
index a6f9fffce..a6f9fffce 100644
--- a/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.docs
+++ b/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.docs
diff --git a/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.install b/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.install
new file mode 100644
index 000000000..7ea7610b7
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.install
@@ -0,0 +1,15 @@
+debian/tmp/opt/trinity/bin/rbqtsh
+debian/tmp/opt/trinity/bin/rbqtapi
+debian/tmp/opt/trinity/bin/rbuic
+debian/tmp/opt/trinity/bin/qtrubyinit
+
+debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb
+debian/tmp/opt/trinity/lib/ruby/*/Qt.rb
+
+debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.so*
+debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la
+
+debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so*
+debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la
+
+qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
diff --git a/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.manpages b/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.manpages
index f2dc6de31..f2dc6de31 100644
--- a/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.manpages
+++ b/ubuntu/precise/tdebindings/debian/libqt0-ruby-trinity.manpages
diff --git a/ubuntu/precise/tdebindings/debian/libtrinity-java-trinity.docs b/ubuntu/precise/tdebindings/debian/libtrinity-java-trinity.docs
index 6f113fce7..a2e63686d 100644
--- a/ubuntu/precise/tdebindings/debian/libtrinity-java-trinity.docs
+++ b/ubuntu/precise/tdebindings/debian/libtrinity-java-trinity.docs
@@ -1,2 +1,2 @@
-kdejava/koala/examples
-kdejava/koala/test
+tdejava/koala/examples
+tdejava/koala/test
diff --git a/ubuntu/precise/tdebindings/debian/libtrinity-jni-trinity.docs b/ubuntu/precise/tdebindings/debian/libtrinity-jni-trinity.docs
index 56222195b..6948746d5 100644
--- a/ubuntu/precise/tdebindings/debian/libtrinity-jni-trinity.docs
+++ b/ubuntu/precise/tdebindings/debian/libtrinity-jni-trinity.docs
@@ -1,4 +1,4 @@
-kdejava/AUTHORS
-kdejava/NEWS
-kdejava/README
-kdejava/TODO
+tdejava/AUTHORS
+tdejava/NEWS
+tdejava/README
+tdejava/TODO
diff --git a/ubuntu/precise/tdebindings/debian/libtrinity-jni-trinity.install b/ubuntu/precise/tdebindings/debian/libtrinity-jni-trinity.install
index 0c661dcee..e0450f12b 100644
--- a/ubuntu/precise/tdebindings/debian/libtrinity-jni-trinity.install
+++ b/ubuntu/precise/tdebindings/debian/libtrinity-jni-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1
-debian/tmp/opt/trinity/lib/jni/libkdejava.la
-debian/tmp/opt/trinity/lib/jni/libkdejava.so
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1.0.0
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1
+debian/tmp/opt/trinity/lib/jni/libtdejava.la
+debian/tmp/opt/trinity/lib/jni/libtdejava.so
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1.0.0
 
-kdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
+tdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
diff --git a/ubuntu/precise/tdebindings/debian/local/rbkdeapi.1 b/ubuntu/precise/tdebindings/debian/local/rbkdeapi.1
deleted file mode 100644
index ba6772436..000000000
--- a/ubuntu/precise/tdebindings/debian/local/rbkdeapi.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH RBKDEAPI 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
-.SH NAME
-rbkdeapi \- A Korundum KDE Ruby Introspection Tool
-.SH SYNOPSIS
-.B rbkdeapi
-[options] [<class>]
-.SH DESCRIPTION
-Rbkdeapi is a Korundum KDE Ruby Introspection Tool, similar to
-javap(1).  Use it to find a list of method for a certain Korundum class.
-.SH OPTIONS
-.TP 
-.B \-r <re>
-Find all functions matching regular expression/keyword <re>
-.TP
-.B \-i
-Perform a case insensitive search ( only meaningful in combination with -r )
-.TP
-.B \-p
-Display also inherited methods.
-.TP
-.B \-v
-Print QtRuby and Qt versions.
-.TP
-.B \-h
-Print a help message.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-rbqtapi(1)
diff --git a/ubuntu/precise/tdebindings/debian/local/rbkdesh.1 b/ubuntu/precise/tdebindings/debian/local/rbkdesh.1
deleted file mode 100644
index 1fd7b6784..000000000
--- a/ubuntu/precise/tdebindings/debian/local/rbkdesh.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH RBKDESH 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
-.SH NAME
-rbkdesh \- An Interactive Korundum Shell
-.SH SYNOPSIS
-.B rbkdesh
-[options]
-.SH DESCRIPTION
-Rbkdesh is an interactive Korundum shell.  It shows a GUI dialog box
-where you can enter Ruby code using the Korundum KDE Ruby bindings
-library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbqtsh(1)
diff --git a/ubuntu/precise/tdebindings/debian/local/rbqtapi.1 b/ubuntu/precise/tdebindings/debian/local/rbqtapi.1
index e89b6f57d..a72e4e991 100644
--- a/ubuntu/precise/tdebindings/debian/local/rbqtapi.1
+++ b/ubuntu/precise/tdebindings/debian/local/rbqtapi.1
@@ -26,4 +26,4 @@ Print a help message.
 .SH AUTHOR
 Alexander Kellett
 .SH SEE ALSO
-rbkdeapi(1)
+rbtdeapi(1)
diff --git a/ubuntu/precise/tdebindings/debian/local/rbqtsh.1 b/ubuntu/precise/tdebindings/debian/local/rbqtsh.1
index dfa020d3d..75b2bd575 100644
--- a/ubuntu/precise/tdebindings/debian/local/rbqtsh.1
+++ b/ubuntu/precise/tdebindings/debian/local/rbqtsh.1
@@ -13,4 +13,4 @@ This program takes no options.
 Germain Garand
 Alexander Kellett
 .SH SEE ALSO
-rbkdesh(1)
+rbtdesh(1)
diff --git a/ubuntu/precise/tdebindings/debian/local/rbtdeapi.1 b/ubuntu/precise/tdebindings/debian/local/rbtdeapi.1
new file mode 100644
index 000000000..e3d166225
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/local/rbtdeapi.1
@@ -0,0 +1,29 @@
+.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
+.SH NAME
+rbtdeapi \- A Korundum TDE Ruby Introspection Tool
+.SH SYNOPSIS
+.B rbtdeapi
+[options] [<class>]
+.SH DESCRIPTION
+Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to
+javap(1).  Use it to find a list of method for a certain Korundum class.
+.SH OPTIONS
+.TP 
+.B \-r <re>
+Find all functions matching regular expression/keyword <re>
+.TP
+.B \-i
+Perform a case insensitive search ( only meaningful in combination with -r )
+.TP
+.B \-p
+Display also inherited methods.
+.TP
+.B \-v
+Print QtRuby and Qt versions.
+.TP
+.B \-h
+Print a help message.
+.SH AUTHOR
+Alexander Kellett
+.SH SEE ALSO
+rbqtapi(1)
diff --git a/ubuntu/precise/tdebindings/debian/local/rbtdesh.1 b/ubuntu/precise/tdebindings/debian/local/rbtdesh.1
new file mode 100644
index 000000000..84e240fc4
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/local/rbtdesh.1
@@ -0,0 +1,17 @@
+.TH RBKDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
+.SH NAME
+rbtdesh \- An Interactive Korundum Shell
+.SH SYNOPSIS
+.B rbtdesh
+[options]
+.SH DESCRIPTION
+Rbtdesh is an interactive Korundum shell.  It shows a GUI dialog box
+where you can enter Ruby code using the Korundum TDE Ruby bindings
+library.
+.SH OPTIONS
+This program takes no options.
+.SH AUTHOR
+Germain Garand
+Alexander Kellett
+.SH SEE ALSO
+rbqtsh(1)
diff --git a/ubuntu/precise/tdebindings/debian/rules b/ubuntu/precise/tdebindings/debian/rules
index dc53fba79..98d509fa0 100755
--- a/ubuntu/precise/tdebindings/debian/rules
+++ b/ubuntu/precise/tdebindings/debian/rules
@@ -47,8 +47,8 @@ PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinit
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
-DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby1.8-trinity       = -n
-DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby1.8-trinity = -n
+DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby-trinity       = -n
+DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby-trinity = -n
 
 ###
 
@@ -127,10 +127,10 @@ binary-install/juic-trinity::
 binary-install/libdcop3-java-trinity-dev::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libkorundum0-ruby1.8-trinity::
+binary-install/libkorundum0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libqt0-ruby1.8-trinity::
+binary-install/libqt0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 binary-install/python-dcop-trinity::
diff --git a/ubuntu/precise/tdebindings/debian/tde-xparts-extras-trinity.install b/ubuntu/precise/tdebindings/debian/tde-xparts-extras-trinity.install
index 764c26e42..debb8165a 100644
--- a/ubuntu/precise/tdebindings/debian/tde-xparts-extras-trinity.install
+++ b/ubuntu/precise/tdebindings/debian/tde-xparts-extras-trinity.install
@@ -3,10 +3,10 @@
 #debian/tmp/opt/trinity/lib/libdcopc.so
 #debian/tmp/opt/trinity/lib/libdcopc.la
 #debian/tmp/opt/trinity/include/dcopc
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1.0.0
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1
-#debian/tmp/opt/trinity/lib/libkdexparts.so
-#debian/tmp/opt/trinity/lib/libkdexparts.la
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1.0.0
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1
+#debian/tmp/opt/trinity/lib/libtdexparts.so
+#debian/tmp/opt/trinity/lib/libtdexparts.la
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0.0.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so
diff --git a/ubuntu/raring/applications/amarok/debian/control b/ubuntu/raring/applications/amarok/debian/control
index 736d76a5b..ec278fc18 100644
--- a/ubuntu/raring/applications/amarok/debian/control
+++ b/ubuntu/raring/applications/amarok/debian/control
@@ -22,7 +22,7 @@ Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trini
 Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
- python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
+ python, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
@@ -52,7 +52,7 @@ Depends: ruby
 Replaces: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
 Breaks: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
 Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby1.8-trinity, python, python-qt3
+Suggests: libqt0-ruby-trinity, python, python-tqt
 Description: architecture independent files for Amarok [Trinity]
  This package contains architecture independent files needed for Amarok to run
  properly. It also provides Amarok documentation. Therefore, unless you have
diff --git a/ubuntu/raring/applications/soundkonverter/debian/control b/ubuntu/raring/applications/soundkonverter/debian/control
index f322727a3..a3c6c1e05 100644
--- a/ubuntu/raring/applications/soundkonverter/debian/control
+++ b/ubuntu/raring/applications/soundkonverter/debian/control
@@ -33,7 +33,7 @@ Description: audio converter frontend for Trinity
 
 Package: soundkonverter-amarok-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity
+Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby-trinity
 Replaces: soundkonverter-amarok-kde3 (<< 4:14.0.0~), soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Breaks: soundkonverter-amarok-kde3 (<< 4:14.0.0~), soundkonverter-amarok-trinity (<< 4:14.0.0~)
 Description: audio converter frontend for Trinity (Amarok script)
diff --git a/ubuntu/raring/tdebindings/debian/control b/ubuntu/raring/tdebindings/debian/control
index 717572811..9660f943a 100644
--- a/ubuntu/raring/tdebindings/debian/control
+++ b/ubuntu/raring/tdebindings/debian/control
@@ -258,12 +258,13 @@ Description: The Qt Java UI Compiler
  .
  This package is part of the official TDE bindings module.
 
-Package: libkorundum0-ruby1.8-trinity
+Package: libkorundum0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libkorundum0-ruby1.8-kde3 (<< 4:14.0.0~), libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libkorundum0-ruby1.8-kde3 (<< 4:14.0.0~), libkorundum0-ruby1.8-trinity (<< 4:14.0.0~)
-Depends: libqt0-ruby1.8-trinity (= ${binary:Version}), ${shlibs:Depends}
+Depends: libqt0-ruby-trinity (= ${binary:Version}), ${shlibs:Depends}
+Provides: libkorundum0-ruby1.8-trinity
 Description: TDE bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Korundum TDE Ruby bindings.
@@ -273,12 +274,13 @@ Description: TDE bindings for Ruby [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libqt0-ruby1.8-trinity
+Package: libqt0-ruby-trinity
 Architecture: any
 Section: interpreters
 Replaces: libqt0-ruby1.8-kde3 (<< 4:14.0.0~), libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Breaks: libqt0-ruby1.8-kde3 (<< 4:14.0.0~), libqt0-ruby1.8-trinity (<< 4:14.0.0~)
 Depends: ruby, ${shlibs:Depends}
+Provides: libqt0-ruby1.8-trinity
 Description: Qt bindings for Ruby [Trinity]
  This package contains the files necessary for running and developing
  Ruby code using the Qt Ruby bindings.
diff --git a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.docs
index fcf01a118..fcf01a118 100644
--- a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.docs
+++ b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.docs
diff --git a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.install b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.install
new file mode 100644
index 000000000..c0da99000
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.install
@@ -0,0 +1,12 @@
+debian/tmp/opt/trinity/bin/rbtdesh
+debian/tmp/opt/trinity/bin/rbtdeapi
+debian/tmp/opt/trinity/bin/krubyinit
+debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
+
+debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb
+debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
+
+debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so*
+debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la
+
+korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
diff --git a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.manpages
new file mode 100644
index 000000000..ab2f0ee35
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby-trinity.manpages
@@ -0,0 +1,3 @@
+debian/local/krubyinit.1
+debian/local/rbtdesh.1
+debian/local/rbtdeapi.1
diff --git a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
deleted file mode 100644
index ebec44d37..000000000
--- a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ /dev/null
@@ -1,12 +0,0 @@
-debian/tmp/opt/trinity/bin/rbkdesh
-debian/tmp/opt/trinity/bin/rbkdeapi
-debian/tmp/opt/trinity/bin/krubyinit
-debian/tmp/opt/trinity/bin/rbtdeconfig_compiler
-
-debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb
-debian/tmp/opt/trinity/lib/ruby/*/KDE/korundum.rb
-
-debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so*
-debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la
-
-korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby1.8
diff --git a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages b/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
deleted file mode 100644
index 0dcb02444..000000000
--- a/ubuntu/raring/tdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/local/krubyinit.1
-debian/local/rbkdesh.1
-debian/local/rbkdeapi.1
diff --git a/ubuntu/raring/tdebindings/debian/libqt0-ruby1.8-trinity.docs b/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.docs
index a6f9fffce..a6f9fffce 100644
--- a/ubuntu/raring/tdebindings/debian/libqt0-ruby1.8-trinity.docs
+++ b/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.docs
diff --git a/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.install b/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.install
new file mode 100644
index 000000000..7ea7610b7
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.install
@@ -0,0 +1,15 @@
+debian/tmp/opt/trinity/bin/rbqtsh
+debian/tmp/opt/trinity/bin/rbqtapi
+debian/tmp/opt/trinity/bin/rbuic
+debian/tmp/opt/trinity/bin/qtrubyinit
+
+debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb
+debian/tmp/opt/trinity/lib/ruby/*/Qt.rb
+
+debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.so*
+debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la
+
+debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so*
+debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la
+
+qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
diff --git a/ubuntu/raring/tdebindings/debian/libqt0-ruby1.8-trinity.manpages b/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.manpages
index f2dc6de31..f2dc6de31 100644
--- a/ubuntu/raring/tdebindings/debian/libqt0-ruby1.8-trinity.manpages
+++ b/ubuntu/raring/tdebindings/debian/libqt0-ruby-trinity.manpages
diff --git a/ubuntu/raring/tdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/raring/tdebindings/debian/libqt0-ruby1.8-trinity.install
deleted file mode 100644
index 2f075b24e..000000000
--- a/ubuntu/raring/tdebindings/debian/libqt0-ruby1.8-trinity.install
+++ /dev/null
@@ -1,15 +0,0 @@
-debian/tmp/opt/trinity/bin/rbqtsh
-debian/tmp/opt/trinity/bin/rbqtapi
-debian/tmp/opt/trinity/bin/rbuic
-debian/tmp/opt/trinity/bin/qtrubyinit
-
-debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb
-debian/tmp/opt/trinity/lib/ruby/*/Qt.rb
-
-debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.so*
-debian/tmp/opt/trinity/lib/ruby/*/*/qtruby.la
-
-debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so*
-debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la
-
-qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8
diff --git a/ubuntu/raring/tdebindings/debian/libtrinity-java-trinity.docs b/ubuntu/raring/tdebindings/debian/libtrinity-java-trinity.docs
index 6f113fce7..a2e63686d 100644
--- a/ubuntu/raring/tdebindings/debian/libtrinity-java-trinity.docs
+++ b/ubuntu/raring/tdebindings/debian/libtrinity-java-trinity.docs
@@ -1,2 +1,2 @@
-kdejava/koala/examples
-kdejava/koala/test
+tdejava/koala/examples
+tdejava/koala/test
diff --git a/ubuntu/raring/tdebindings/debian/libtrinity-jni-trinity.docs b/ubuntu/raring/tdebindings/debian/libtrinity-jni-trinity.docs
index 56222195b..6948746d5 100644
--- a/ubuntu/raring/tdebindings/debian/libtrinity-jni-trinity.docs
+++ b/ubuntu/raring/tdebindings/debian/libtrinity-jni-trinity.docs
@@ -1,4 +1,4 @@
-kdejava/AUTHORS
-kdejava/NEWS
-kdejava/README
-kdejava/TODO
+tdejava/AUTHORS
+tdejava/NEWS
+tdejava/README
+tdejava/TODO
diff --git a/ubuntu/raring/tdebindings/debian/libtrinity-jni-trinity.install b/ubuntu/raring/tdebindings/debian/libtrinity-jni-trinity.install
index 0c661dcee..e0450f12b 100644
--- a/ubuntu/raring/tdebindings/debian/libtrinity-jni-trinity.install
+++ b/ubuntu/raring/tdebindings/debian/libtrinity-jni-trinity.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1
-debian/tmp/opt/trinity/lib/jni/libkdejava.la
-debian/tmp/opt/trinity/lib/jni/libkdejava.so
-debian/tmp/opt/trinity/lib/jni/libkdejava.so.1.0.0
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1
+debian/tmp/opt/trinity/lib/jni/libtdejava.la
+debian/tmp/opt/trinity/lib/jni/libtdejava.so
+debian/tmp/opt/trinity/lib/jni/libtdejava.so.1.0.0
 
-kdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
+tdejava/ChangeLog /opt/trinity/share/doc/libtrinity-jni
diff --git a/ubuntu/raring/tdebindings/debian/local/rbkdeapi.1 b/ubuntu/raring/tdebindings/debian/local/rbkdeapi.1
deleted file mode 100644
index ba6772436..000000000
--- a/ubuntu/raring/tdebindings/debian/local/rbkdeapi.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH RBKDEAPI 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
-.SH NAME
-rbkdeapi \- A Korundum KDE Ruby Introspection Tool
-.SH SYNOPSIS
-.B rbkdeapi
-[options] [<class>]
-.SH DESCRIPTION
-Rbkdeapi is a Korundum KDE Ruby Introspection Tool, similar to
-javap(1).  Use it to find a list of method for a certain Korundum class.
-.SH OPTIONS
-.TP 
-.B \-r <re>
-Find all functions matching regular expression/keyword <re>
-.TP
-.B \-i
-Perform a case insensitive search ( only meaningful in combination with -r )
-.TP
-.B \-p
-Display also inherited methods.
-.TP
-.B \-v
-Print QtRuby and Qt versions.
-.TP
-.B \-h
-Print a help message.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-rbqtapi(1)
diff --git a/ubuntu/raring/tdebindings/debian/local/rbkdesh.1 b/ubuntu/raring/tdebindings/debian/local/rbkdesh.1
deleted file mode 100644
index 1fd7b6784..000000000
--- a/ubuntu/raring/tdebindings/debian/local/rbkdesh.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH RBKDESH 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
-.SH NAME
-rbkdesh \- An Interactive Korundum Shell
-.SH SYNOPSIS
-.B rbkdesh
-[options]
-.SH DESCRIPTION
-Rbkdesh is an interactive Korundum shell.  It shows a GUI dialog box
-where you can enter Ruby code using the Korundum KDE Ruby bindings
-library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbqtsh(1)
diff --git a/ubuntu/raring/tdebindings/debian/local/rbqtapi.1 b/ubuntu/raring/tdebindings/debian/local/rbqtapi.1
index e89b6f57d..a72e4e991 100644
--- a/ubuntu/raring/tdebindings/debian/local/rbqtapi.1
+++ b/ubuntu/raring/tdebindings/debian/local/rbqtapi.1
@@ -26,4 +26,4 @@ Print a help message.
 .SH AUTHOR
 Alexander Kellett
 .SH SEE ALSO
-rbkdeapi(1)
+rbtdeapi(1)
diff --git a/ubuntu/raring/tdebindings/debian/local/rbqtsh.1 b/ubuntu/raring/tdebindings/debian/local/rbqtsh.1
index dfa020d3d..75b2bd575 100644
--- a/ubuntu/raring/tdebindings/debian/local/rbqtsh.1
+++ b/ubuntu/raring/tdebindings/debian/local/rbqtsh.1
@@ -13,4 +13,4 @@ This program takes no options.
 Germain Garand
 Alexander Kellett
 .SH SEE ALSO
-rbkdesh(1)
+rbtdesh(1)
diff --git a/ubuntu/raring/tdebindings/debian/local/rbtdeapi.1 b/ubuntu/raring/tdebindings/debian/local/rbtdeapi.1
new file mode 100644
index 000000000..e3d166225
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/local/rbtdeapi.1
@@ -0,0 +1,29 @@
+.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
+.SH NAME
+rbtdeapi \- A Korundum TDE Ruby Introspection Tool
+.SH SYNOPSIS
+.B rbtdeapi
+[options] [<class>]
+.SH DESCRIPTION
+Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to
+javap(1).  Use it to find a list of method for a certain Korundum class.
+.SH OPTIONS
+.TP 
+.B \-r <re>
+Find all functions matching regular expression/keyword <re>
+.TP
+.B \-i
+Perform a case insensitive search ( only meaningful in combination with -r )
+.TP
+.B \-p
+Display also inherited methods.
+.TP
+.B \-v
+Print QtRuby and Qt versions.
+.TP
+.B \-h
+Print a help message.
+.SH AUTHOR
+Alexander Kellett
+.SH SEE ALSO
+rbqtapi(1)
diff --git a/ubuntu/raring/tdebindings/debian/local/rbtdesh.1 b/ubuntu/raring/tdebindings/debian/local/rbtdesh.1
new file mode 100644
index 000000000..84e240fc4
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/local/rbtdesh.1
@@ -0,0 +1,17 @@
+.TH RBKDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
+.SH NAME
+rbtdesh \- An Interactive Korundum Shell
+.SH SYNOPSIS
+.B rbtdesh
+[options]
+.SH DESCRIPTION
+Rbtdesh is an interactive Korundum shell.  It shows a GUI dialog box
+where you can enter Ruby code using the Korundum TDE Ruby bindings
+library.
+.SH OPTIONS
+This program takes no options.
+.SH AUTHOR
+Germain Garand
+Alexander Kellett
+.SH SEE ALSO
+rbqtsh(1)
diff --git a/ubuntu/raring/tdebindings/debian/rules b/ubuntu/raring/tdebindings/debian/rules
index dc53fba79..98d509fa0 100755
--- a/ubuntu/raring/tdebindings/debian/rules
+++ b/ubuntu/raring/tdebindings/debian/rules
@@ -47,8 +47,8 @@ PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinit
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
-DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby1.8-trinity       = -n
-DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby1.8-trinity = -n
+DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby-trinity       = -n
+DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby-trinity = -n
 
 ###
 
@@ -127,10 +127,10 @@ binary-install/juic-trinity::
 binary-install/libdcop3-java-trinity-dev::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libkorundum0-ruby1.8-trinity::
+binary-install/libkorundum0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
-binary-install/libqt0-ruby1.8-trinity::
+binary-install/libqt0-ruby-trinity::
 	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 binary-install/python-dcop-trinity::
diff --git a/ubuntu/raring/tdebindings/debian/tde-xparts-extras-trinity.install b/ubuntu/raring/tdebindings/debian/tde-xparts-extras-trinity.install
index 764c26e42..debb8165a 100644
--- a/ubuntu/raring/tdebindings/debian/tde-xparts-extras-trinity.install
+++ b/ubuntu/raring/tdebindings/debian/tde-xparts-extras-trinity.install
@@ -3,10 +3,10 @@
 #debian/tmp/opt/trinity/lib/libdcopc.so
 #debian/tmp/opt/trinity/lib/libdcopc.la
 #debian/tmp/opt/trinity/include/dcopc
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1.0.0
-#debian/tmp/opt/trinity/lib/libkdexparts.so.1
-#debian/tmp/opt/trinity/lib/libkdexparts.so
-#debian/tmp/opt/trinity/lib/libkdexparts.la
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1.0.0
+#debian/tmp/opt/trinity/lib/libtdexparts.so.1
+#debian/tmp/opt/trinity/lib/libtdexparts.so
+#debian/tmp/opt/trinity/lib/libtdexparts.la
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0.0.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so.0
 #debian/tmp/opt/trinity/lib/libgtkxparts.so