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

117 files changed, 319 insertions, 246 deletions

diff --git a/debian/lenny/libraries/libtqt-perl/debian/control b/debian/lenny/libraries/libtqt-perl/debian/control
index 3bef4f1d3..5be93f4a3 100644
--- a/debian/lenny/libraries/libtqt-perl/debian/control
+++ b/debian/lenny/libraries/libtqt-perl/debian/control
@@ -3,7 +3,7 @@ Section: perl
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bart Martens <bartm@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
 Build-Conflicts: libtqt-perl
 Standards-Version: 3.8.4
 
diff --git a/debian/lenny/libraries/libtqt-perl/debian/rules b/debian/lenny/libraries/libtqt-perl/debian/rules
index 1d77c70fc..5efe954b5 100755
--- a/debian/lenny/libraries/libtqt-perl/debian/rules
+++ b/debian/lenny/libraries/libtqt-perl/debian/rules
@@ -15,7 +15,7 @@ SAVERESTORE=\
 	Makefile.in \
 	puic/Makefile.in \
 	smoke/Makefile.in \
-	smoke/qt/Makefile.in \
+	smoke/tqt/Makefile.in \
 	PerlTQt/bin \
 
 DEB_AUTO_UPDATE_AUTOCONF := 2.61
diff --git a/debian/lenny/metapackages/rename-meta/debian/control b/debian/lenny/metapackages/rename-meta/debian/control
index 8a3c151cb..bfc710599 100644
--- a/debian/lenny/metapackages/rename-meta/debian/control
+++ b/debian/lenny/metapackages/rename-meta/debian/control
@@ -1146,6 +1146,18 @@ Depends: tdebindings-java-trinity
 Conflicts: kdebindings-java-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: libsmokeqt1-trinity
+Architecture: all
+Depends: libsmoketqt1-trinity
+Conflicts: libsmokeqt1-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: libsmokeqt-trinity-dev
+Architecture: all
+Depends: libsmoketqt-trinity-dev
+Conflicts: libsmokeqt-trinity-dev (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: libsmokekde1-trinity
 Architecture: all
 Depends: libsmoketde1-trinity
diff --git a/debian/lenny/tdebindings/debian/control b/debian/lenny/tdebindings/debian/control
index 9df9773a2..b1ebe7223 100644
--- a/debian/lenny/tdebindings/debian/control
+++ b/debian/lenny/tdebindings/debian/control
@@ -124,29 +124,29 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt1-trinity
+Package: libsmoketqt1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokeqt1-trinity (<< 4:14.0.0)
 Breaks: libsmokeqt1-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Description: SMOKE Binding Library to Qt
+Description: SMOKE Binding Library to TQt
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library.
+ TQt library.
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt-trinity-dev
+Package: libsmoketqt-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokeqt-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokeqt-trinity-dev (<< 4:14.0.0)
-Depends: libsmokeqt1-trinity (= ${binary:Version})
-Description: SMOKE Binding Library to Qt - Development Files
+Depends: libsmoketqt1-trinity (= ${binary:Version})
+Description: SMOKE Binding Library to TQt - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library. This package contains the development files for the
+ TQt library. This package contains the development files for the
  library.
  .
  If you are a normal Debian user, you probably don't need this
@@ -154,7 +154,7 @@ Description: SMOKE Binding Library to Qt - Development Files
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde1-trinity
+Package: libsmoketde1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokekde1-trinity (<< 4:14.0.0)
@@ -167,12 +167,12 @@ Description: SMOKE Binding Library to TDE
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde-trinity-dev
+Package: libsmoketde-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokekde-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokekde-trinity-dev (<< 4:14.0.0)
-Depends: libsmokekde1-trinity (= ${binary:Version})
+Depends: libsmoketde1-trinity (= ${binary:Version})
 Description: SMOKE Binding Library to TDE - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
diff --git a/debian/lenny/tdebindings/debian/libsmokekde-trinity-dev.install b/debian/lenny/tdebindings/debian/libsmokekde-trinity-dev.install
deleted file mode 100644
index 85021cc40..000000000
--- a/debian/lenny/tdebindings/debian/libsmokekde-trinity-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so
-debian/tmp/opt/trinity/lib/libsmokekde.la
diff --git a/debian/lenny/tdebindings/debian/libsmokekde-trinity-dev.links b/debian/lenny/tdebindings/debian/libsmokekde-trinity-dev.links
deleted file mode 100644
index da4b8e1a2..000000000
--- a/debian/lenny/tdebindings/debian/libsmokekde-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokekde1 /opt/trinity/share/doc/libsmokekde-dev
diff --git a/debian/lenny/tdebindings/debian/libsmokekde1-trinity.install b/debian/lenny/tdebindings/debian/libsmokekde1-trinity.install
deleted file mode 100644
index 173913313..000000000
--- a/debian/lenny/tdebindings/debian/libsmokekde1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokekde.so.1
diff --git a/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install b/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install
deleted file mode 100644
index 99a21c1de..000000000
--- a/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/include/tde/smoke.h
-debian/tmp/opt/trinity/lib/libsmokeqt.so
-debian/tmp/opt/trinity/lib/libsmokeqt.la
diff --git a/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.links b/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.links
deleted file mode 100644
index ba0272c14..000000000
--- a/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokeqt1 /opt/trinity/share/doc/libsmokeqt-dev
diff --git a/debian/lenny/tdebindings/debian/libsmokeqt1-trinity.install b/debian/lenny/tdebindings/debian/libsmokeqt1-trinity.install
deleted file mode 100644
index 3bf2b300b..000000000
--- a/debian/lenny/tdebindings/debian/libsmokeqt1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1
diff --git a/debian/lenny/tdebindings/debian/libsmoketde-trinity-dev.install b/debian/lenny/tdebindings/debian/libsmoketde-trinity-dev.install
new file mode 100644
index 000000000..ccc7952cf
--- /dev/null
+++ b/debian/lenny/tdebindings/debian/libsmoketde-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so
+debian/tmp/opt/trinity/lib/libsmoketde.la
diff --git a/debian/lenny/tdebindings/debian/libsmoketde-trinity-dev.links b/debian/lenny/tdebindings/debian/libsmoketde-trinity-dev.links
new file mode 100644
index 000000000..bc9055637
--- /dev/null
+++ b/debian/lenny/tdebindings/debian/libsmoketde-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketde1 /opt/trinity/share/doc/libsmoketde-dev
diff --git a/debian/lenny/tdebindings/debian/libsmoketde1-trinity.install b/debian/lenny/tdebindings/debian/libsmoketde1-trinity.install
new file mode 100644
index 000000000..d36233050
--- /dev/null
+++ b/debian/lenny/tdebindings/debian/libsmoketde1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketde.so.1
diff --git a/debian/lenny/tdebindings/debian/libsmoketqt-trinity-dev.install b/debian/lenny/tdebindings/debian/libsmoketqt-trinity-dev.install
new file mode 100644
index 000000000..663329673
--- /dev/null
+++ b/debian/lenny/tdebindings/debian/libsmoketqt-trinity-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/include/tde/smoke.h
+debian/tmp/opt/trinity/lib/libsmoketqt.so
+debian/tmp/opt/trinity/lib/libsmoketqt.la
diff --git a/debian/lenny/tdebindings/debian/libsmoketqt-trinity-dev.links b/debian/lenny/tdebindings/debian/libsmoketqt-trinity-dev.links
new file mode 100644
index 000000000..36cc65f6e
--- /dev/null
+++ b/debian/lenny/tdebindings/debian/libsmoketqt-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketqt1 /opt/trinity/share/doc/libsmoketqt-dev
diff --git a/debian/lenny/tdebindings/debian/libsmoketqt1-trinity.install b/debian/lenny/tdebindings/debian/libsmoketqt1-trinity.install
new file mode 100644
index 000000000..9b2cbbe21
--- /dev/null
+++ b/debian/lenny/tdebindings/debian/libsmoketqt1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1
diff --git a/debian/lenny/tdebindings/debian/rules b/debian/lenny/tdebindings/debian/rules
index b503f7580..2a486617b 100755
--- a/debian/lenny/tdebindings/debian/rules
+++ b/debian/lenny/tdebindings/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 
 # These are not all the packages with libraries, but only those that
 # need to be in DEB_SHLIBDEPS_INCLUDE...
-PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity
+PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
@@ -63,10 +63,10 @@ clean::
 	rm -f dcopjava/binding/libjavadcop.la
 	rm -f dcopjava/binding/org_kde_DCOP_Client.h
 	rm -f dcopjava/dcopidl2java/dcopidl2java.all_cpp.cpp
-	rm -f smoke/kde/qtdefines
-	rm -f smoke/kde/smokedata.cpp.diff
-	rm -f smoke/qt/qtdefines
-	rm -f smoke/qt/smokedata.cpp.diff
+	rm -f smoke/tde/qtdefines
+	rm -f smoke/tde/smokedata.cpp.diff
+	rm -f smoke/tqt/qtdefines
+	rm -f smoke/tqt/smokedata.cpp.diff
 
 
 common-build-indep:: stamp-build-dcopjava
@@ -138,5 +138,5 @@ common-binary-post-install-indep::
 
 PACKAGES_WITH_USD_SYMLINK = tdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \
 			    libdcop3-java-trinity-dev libdcop3-java-trinity \
-			    libsmokekde-trinity-dev libsmokeqt-trinity-dev \
+			    libsmoketde-trinity-dev libsmoketqt-trinity-dev \
 			    kjscmd-trinity libkjsembed-trinity-dev
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/control b/debian/squeeze/libraries/libtqt-perl/debian/control
index 3bef4f1d3..5be93f4a3 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/control
+++ b/debian/squeeze/libraries/libtqt-perl/debian/control
@@ -3,7 +3,7 @@ Section: perl
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bart Martens <bartm@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
 Build-Conflicts: libtqt-perl
 Standards-Version: 3.8.4
 
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/rules b/debian/squeeze/libraries/libtqt-perl/debian/rules
index 1d77c70fc..5efe954b5 100755
--- a/debian/squeeze/libraries/libtqt-perl/debian/rules
+++ b/debian/squeeze/libraries/libtqt-perl/debian/rules
@@ -15,7 +15,7 @@ SAVERESTORE=\
 	Makefile.in \
 	puic/Makefile.in \
 	smoke/Makefile.in \
-	smoke/qt/Makefile.in \
+	smoke/tqt/Makefile.in \
 	PerlTQt/bin \
 
 DEB_AUTO_UPDATE_AUTOCONF := 2.61
diff --git a/debian/squeeze/metapackages/rename-meta/debian/control b/debian/squeeze/metapackages/rename-meta/debian/control
index 8a3c151cb..bfc710599 100644
--- a/debian/squeeze/metapackages/rename-meta/debian/control
+++ b/debian/squeeze/metapackages/rename-meta/debian/control
@@ -1146,6 +1146,18 @@ Depends: tdebindings-java-trinity
 Conflicts: kdebindings-java-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: libsmokeqt1-trinity
+Architecture: all
+Depends: libsmoketqt1-trinity
+Conflicts: libsmokeqt1-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: libsmokeqt-trinity-dev
+Architecture: all
+Depends: libsmoketqt-trinity-dev
+Conflicts: libsmokeqt-trinity-dev (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: libsmokekde1-trinity
 Architecture: all
 Depends: libsmoketde1-trinity
diff --git a/debian/squeeze/tdebindings/debian/control b/debian/squeeze/tdebindings/debian/control
index 9df9773a2..b1ebe7223 100644
--- a/debian/squeeze/tdebindings/debian/control
+++ b/debian/squeeze/tdebindings/debian/control
@@ -124,29 +124,29 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt1-trinity
+Package: libsmoketqt1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokeqt1-trinity (<< 4:14.0.0)
 Breaks: libsmokeqt1-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Description: SMOKE Binding Library to Qt
+Description: SMOKE Binding Library to TQt
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library.
+ TQt library.
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt-trinity-dev
+Package: libsmoketqt-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokeqt-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokeqt-trinity-dev (<< 4:14.0.0)
-Depends: libsmokeqt1-trinity (= ${binary:Version})
-Description: SMOKE Binding Library to Qt - Development Files
+Depends: libsmoketqt1-trinity (= ${binary:Version})
+Description: SMOKE Binding Library to TQt - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library. This package contains the development files for the
+ TQt library. This package contains the development files for the
  library.
  .
  If you are a normal Debian user, you probably don't need this
@@ -154,7 +154,7 @@ Description: SMOKE Binding Library to Qt - Development Files
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde1-trinity
+Package: libsmoketde1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokekde1-trinity (<< 4:14.0.0)
@@ -167,12 +167,12 @@ Description: SMOKE Binding Library to TDE
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde-trinity-dev
+Package: libsmoketde-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokekde-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokekde-trinity-dev (<< 4:14.0.0)
-Depends: libsmokekde1-trinity (= ${binary:Version})
+Depends: libsmoketde1-trinity (= ${binary:Version})
 Description: SMOKE Binding Library to TDE - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
diff --git a/debian/squeeze/tdebindings/debian/libsmokekde-trinity-dev.install b/debian/squeeze/tdebindings/debian/libsmokekde-trinity-dev.install
deleted file mode 100644
index 85021cc40..000000000
--- a/debian/squeeze/tdebindings/debian/libsmokekde-trinity-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so
-debian/tmp/opt/trinity/lib/libsmokekde.la
diff --git a/debian/squeeze/tdebindings/debian/libsmokekde-trinity-dev.links b/debian/squeeze/tdebindings/debian/libsmokekde-trinity-dev.links
deleted file mode 100644
index da4b8e1a2..000000000
--- a/debian/squeeze/tdebindings/debian/libsmokekde-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokekde1 /opt/trinity/share/doc/libsmokekde-dev
diff --git a/debian/squeeze/tdebindings/debian/libsmokekde1-trinity.install b/debian/squeeze/tdebindings/debian/libsmokekde1-trinity.install
deleted file mode 100644
index 173913313..000000000
--- a/debian/squeeze/tdebindings/debian/libsmokekde1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokekde.so.1
diff --git a/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install b/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install
deleted file mode 100644
index 99a21c1de..000000000
--- a/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/include/tde/smoke.h
-debian/tmp/opt/trinity/lib/libsmokeqt.so
-debian/tmp/opt/trinity/lib/libsmokeqt.la
diff --git a/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.links b/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.links
deleted file mode 100644
index ba0272c14..000000000
--- a/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokeqt1 /opt/trinity/share/doc/libsmokeqt-dev
diff --git a/debian/squeeze/tdebindings/debian/libsmokeqt1-trinity.install b/debian/squeeze/tdebindings/debian/libsmokeqt1-trinity.install
deleted file mode 100644
index 3bf2b300b..000000000
--- a/debian/squeeze/tdebindings/debian/libsmokeqt1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1
diff --git a/debian/squeeze/tdebindings/debian/libsmoketde-trinity-dev.install b/debian/squeeze/tdebindings/debian/libsmoketde-trinity-dev.install
new file mode 100644
index 000000000..ccc7952cf
--- /dev/null
+++ b/debian/squeeze/tdebindings/debian/libsmoketde-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so
+debian/tmp/opt/trinity/lib/libsmoketde.la
diff --git a/debian/squeeze/tdebindings/debian/libsmoketde-trinity-dev.links b/debian/squeeze/tdebindings/debian/libsmoketde-trinity-dev.links
new file mode 100644
index 000000000..bc9055637
--- /dev/null
+++ b/debian/squeeze/tdebindings/debian/libsmoketde-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketde1 /opt/trinity/share/doc/libsmoketde-dev
diff --git a/debian/squeeze/tdebindings/debian/libsmoketde1-trinity.install b/debian/squeeze/tdebindings/debian/libsmoketde1-trinity.install
new file mode 100644
index 000000000..d36233050
--- /dev/null
+++ b/debian/squeeze/tdebindings/debian/libsmoketde1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketde.so.1
diff --git a/debian/squeeze/tdebindings/debian/libsmoketqt-trinity-dev.install b/debian/squeeze/tdebindings/debian/libsmoketqt-trinity-dev.install
new file mode 100644
index 000000000..663329673
--- /dev/null
+++ b/debian/squeeze/tdebindings/debian/libsmoketqt-trinity-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/include/tde/smoke.h
+debian/tmp/opt/trinity/lib/libsmoketqt.so
+debian/tmp/opt/trinity/lib/libsmoketqt.la
diff --git a/debian/squeeze/tdebindings/debian/libsmoketqt-trinity-dev.links b/debian/squeeze/tdebindings/debian/libsmoketqt-trinity-dev.links
new file mode 100644
index 000000000..36cc65f6e
--- /dev/null
+++ b/debian/squeeze/tdebindings/debian/libsmoketqt-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketqt1 /opt/trinity/share/doc/libsmoketqt-dev
diff --git a/debian/squeeze/tdebindings/debian/libsmoketqt1-trinity.install b/debian/squeeze/tdebindings/debian/libsmoketqt1-trinity.install
new file mode 100644
index 000000000..9b2cbbe21
--- /dev/null
+++ b/debian/squeeze/tdebindings/debian/libsmoketqt1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1
diff --git a/debian/squeeze/tdebindings/debian/rules b/debian/squeeze/tdebindings/debian/rules
index b503f7580..2a486617b 100755
--- a/debian/squeeze/tdebindings/debian/rules
+++ b/debian/squeeze/tdebindings/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 
 # These are not all the packages with libraries, but only those that
 # need to be in DEB_SHLIBDEPS_INCLUDE...
-PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity
+PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
@@ -63,10 +63,10 @@ clean::
 	rm -f dcopjava/binding/libjavadcop.la
 	rm -f dcopjava/binding/org_kde_DCOP_Client.h
 	rm -f dcopjava/dcopidl2java/dcopidl2java.all_cpp.cpp
-	rm -f smoke/kde/qtdefines
-	rm -f smoke/kde/smokedata.cpp.diff
-	rm -f smoke/qt/qtdefines
-	rm -f smoke/qt/smokedata.cpp.diff
+	rm -f smoke/tde/qtdefines
+	rm -f smoke/tde/smokedata.cpp.diff
+	rm -f smoke/tqt/qtdefines
+	rm -f smoke/tqt/smokedata.cpp.diff
 
 
 common-build-indep:: stamp-build-dcopjava
@@ -138,5 +138,5 @@ common-binary-post-install-indep::
 
 PACKAGES_WITH_USD_SYMLINK = tdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \
 			    libdcop3-java-trinity-dev libdcop3-java-trinity \
-			    libsmokekde-trinity-dev libsmokeqt-trinity-dev \
+			    libsmoketde-trinity-dev libsmoketqt-trinity-dev \
 			    kjscmd-trinity libkjsembed-trinity-dev
diff --git a/debian/wheezy/libraries/libtqt-perl/debian/control b/debian/wheezy/libraries/libtqt-perl/debian/control
index 3bef4f1d3..5be93f4a3 100644
--- a/debian/wheezy/libraries/libtqt-perl/debian/control
+++ b/debian/wheezy/libraries/libtqt-perl/debian/control
@@ -3,7 +3,7 @@ Section: perl
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bart Martens <bartm@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
 Build-Conflicts: libtqt-perl
 Standards-Version: 3.8.4
 
diff --git a/debian/wheezy/libraries/libtqt-perl/debian/rules b/debian/wheezy/libraries/libtqt-perl/debian/rules
index 1d77c70fc..5efe954b5 100755
--- a/debian/wheezy/libraries/libtqt-perl/debian/rules
+++ b/debian/wheezy/libraries/libtqt-perl/debian/rules
@@ -15,7 +15,7 @@ SAVERESTORE=\
 	Makefile.in \
 	puic/Makefile.in \
 	smoke/Makefile.in \
-	smoke/qt/Makefile.in \
+	smoke/tqt/Makefile.in \
 	PerlTQt/bin \
 
 DEB_AUTO_UPDATE_AUTOCONF := 2.61
diff --git a/debian/wheezy/metapackages/rename-meta/debian/control b/debian/wheezy/metapackages/rename-meta/debian/control
index 8a3c151cb..bfc710599 100644
--- a/debian/wheezy/metapackages/rename-meta/debian/control
+++ b/debian/wheezy/metapackages/rename-meta/debian/control
@@ -1146,6 +1146,18 @@ Depends: tdebindings-java-trinity
 Conflicts: kdebindings-java-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: libsmokeqt1-trinity
+Architecture: all
+Depends: libsmoketqt1-trinity
+Conflicts: libsmokeqt1-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: libsmokeqt-trinity-dev
+Architecture: all
+Depends: libsmoketqt-trinity-dev
+Conflicts: libsmokeqt-trinity-dev (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: libsmokekde1-trinity
 Architecture: all
 Depends: libsmoketde1-trinity
diff --git a/debian/wheezy/tdebindings/debian/control b/debian/wheezy/tdebindings/debian/control
index 9df9773a2..b1ebe7223 100644
--- a/debian/wheezy/tdebindings/debian/control
+++ b/debian/wheezy/tdebindings/debian/control
@@ -124,29 +124,29 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt1-trinity
+Package: libsmoketqt1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokeqt1-trinity (<< 4:14.0.0)
 Breaks: libsmokeqt1-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Description: SMOKE Binding Library to Qt
+Description: SMOKE Binding Library to TQt
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library.
+ TQt library.
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt-trinity-dev
+Package: libsmoketqt-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokeqt-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokeqt-trinity-dev (<< 4:14.0.0)
-Depends: libsmokeqt1-trinity (= ${binary:Version})
-Description: SMOKE Binding Library to Qt - Development Files
+Depends: libsmoketqt1-trinity (= ${binary:Version})
+Description: SMOKE Binding Library to TQt - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library. This package contains the development files for the
+ TQt library. This package contains the development files for the
  library.
  .
  If you are a normal Debian user, you probably don't need this
@@ -154,7 +154,7 @@ Description: SMOKE Binding Library to Qt - Development Files
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde1-trinity
+Package: libsmoketde1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokekde1-trinity (<< 4:14.0.0)
@@ -167,12 +167,12 @@ Description: SMOKE Binding Library to TDE
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde-trinity-dev
+Package: libsmoketde-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokekde-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokekde-trinity-dev (<< 4:14.0.0)
-Depends: libsmokekde1-trinity (= ${binary:Version})
+Depends: libsmoketde1-trinity (= ${binary:Version})
 Description: SMOKE Binding Library to TDE - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
diff --git a/debian/wheezy/tdebindings/debian/libsmokekde-trinity-dev.install b/debian/wheezy/tdebindings/debian/libsmokekde-trinity-dev.install
deleted file mode 100644
index 85021cc40..000000000
--- a/debian/wheezy/tdebindings/debian/libsmokekde-trinity-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so
-debian/tmp/opt/trinity/lib/libsmokekde.la
diff --git a/debian/wheezy/tdebindings/debian/libsmokekde-trinity-dev.links b/debian/wheezy/tdebindings/debian/libsmokekde-trinity-dev.links
deleted file mode 100644
index da4b8e1a2..000000000
--- a/debian/wheezy/tdebindings/debian/libsmokekde-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokekde1 /opt/trinity/share/doc/libsmokekde-dev
diff --git a/debian/wheezy/tdebindings/debian/libsmokekde1-trinity.install b/debian/wheezy/tdebindings/debian/libsmokekde1-trinity.install
deleted file mode 100644
index 173913313..000000000
--- a/debian/wheezy/tdebindings/debian/libsmokekde1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokekde.so.1
diff --git a/debian/wheezy/tdebindings/debian/libsmokeqt-trinity-dev.install b/debian/wheezy/tdebindings/debian/libsmokeqt-trinity-dev.install
deleted file mode 100644
index 99a21c1de..000000000
--- a/debian/wheezy/tdebindings/debian/libsmokeqt-trinity-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/include/tde/smoke.h
-debian/tmp/opt/trinity/lib/libsmokeqt.so
-debian/tmp/opt/trinity/lib/libsmokeqt.la
diff --git a/debian/wheezy/tdebindings/debian/libsmokeqt-trinity-dev.links b/debian/wheezy/tdebindings/debian/libsmokeqt-trinity-dev.links
deleted file mode 100644
index ba0272c14..000000000
--- a/debian/wheezy/tdebindings/debian/libsmokeqt-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokeqt1 /opt/trinity/share/doc/libsmokeqt-dev
diff --git a/debian/wheezy/tdebindings/debian/libsmokeqt1-trinity.install b/debian/wheezy/tdebindings/debian/libsmokeqt1-trinity.install
deleted file mode 100644
index 3bf2b300b..000000000
--- a/debian/wheezy/tdebindings/debian/libsmokeqt1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1
diff --git a/debian/wheezy/tdebindings/debian/libsmoketde-trinity-dev.install b/debian/wheezy/tdebindings/debian/libsmoketde-trinity-dev.install
new file mode 100644
index 000000000..ccc7952cf
--- /dev/null
+++ b/debian/wheezy/tdebindings/debian/libsmoketde-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so
+debian/tmp/opt/trinity/lib/libsmoketde.la
diff --git a/debian/wheezy/tdebindings/debian/libsmoketde-trinity-dev.links b/debian/wheezy/tdebindings/debian/libsmoketde-trinity-dev.links
new file mode 100644
index 000000000..bc9055637
--- /dev/null
+++ b/debian/wheezy/tdebindings/debian/libsmoketde-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketde1 /opt/trinity/share/doc/libsmoketde-dev
diff --git a/debian/wheezy/tdebindings/debian/libsmoketde1-trinity.install b/debian/wheezy/tdebindings/debian/libsmoketde1-trinity.install
new file mode 100644
index 000000000..d36233050
--- /dev/null
+++ b/debian/wheezy/tdebindings/debian/libsmoketde1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketde.so.1
diff --git a/debian/wheezy/tdebindings/debian/libsmoketqt-trinity-dev.install b/debian/wheezy/tdebindings/debian/libsmoketqt-trinity-dev.install
new file mode 100644
index 000000000..663329673
--- /dev/null
+++ b/debian/wheezy/tdebindings/debian/libsmoketqt-trinity-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/include/tde/smoke.h
+debian/tmp/opt/trinity/lib/libsmoketqt.so
+debian/tmp/opt/trinity/lib/libsmoketqt.la
diff --git a/debian/wheezy/tdebindings/debian/libsmoketqt-trinity-dev.links b/debian/wheezy/tdebindings/debian/libsmoketqt-trinity-dev.links
new file mode 100644
index 000000000..36cc65f6e
--- /dev/null
+++ b/debian/wheezy/tdebindings/debian/libsmoketqt-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketqt1 /opt/trinity/share/doc/libsmoketqt-dev
diff --git a/debian/wheezy/tdebindings/debian/libsmoketqt1-trinity.install b/debian/wheezy/tdebindings/debian/libsmoketqt1-trinity.install
new file mode 100644
index 000000000..9b2cbbe21
--- /dev/null
+++ b/debian/wheezy/tdebindings/debian/libsmoketqt1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1
diff --git a/debian/wheezy/tdebindings/debian/rules b/debian/wheezy/tdebindings/debian/rules
index b503f7580..2a486617b 100755
--- a/debian/wheezy/tdebindings/debian/rules
+++ b/debian/wheezy/tdebindings/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 
 # These are not all the packages with libraries, but only those that
 # need to be in DEB_SHLIBDEPS_INCLUDE...
-PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity
+PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
@@ -63,10 +63,10 @@ clean::
 	rm -f dcopjava/binding/libjavadcop.la
 	rm -f dcopjava/binding/org_kde_DCOP_Client.h
 	rm -f dcopjava/dcopidl2java/dcopidl2java.all_cpp.cpp
-	rm -f smoke/kde/qtdefines
-	rm -f smoke/kde/smokedata.cpp.diff
-	rm -f smoke/qt/qtdefines
-	rm -f smoke/qt/smokedata.cpp.diff
+	rm -f smoke/tde/qtdefines
+	rm -f smoke/tde/smokedata.cpp.diff
+	rm -f smoke/tqt/qtdefines
+	rm -f smoke/tqt/smokedata.cpp.diff
 
 
 common-build-indep:: stamp-build-dcopjava
@@ -138,5 +138,5 @@ common-binary-post-install-indep::
 
 PACKAGES_WITH_USD_SYMLINK = tdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \
 			    libdcop3-java-trinity-dev libdcop3-java-trinity \
-			    libsmokekde-trinity-dev libsmokeqt-trinity-dev \
+			    libsmoketde-trinity-dev libsmoketqt-trinity-dev \
 			    kjscmd-trinity libkjsembed-trinity-dev
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
index 2cfd123e8..2d3a653b3 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
@@ -164,20 +164,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_tdelibdir}/*.so
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - %{?version}-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-6
 - Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - %{?version}-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - %{?version}-4
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
-- Rebuild for Fedora 17
-
-* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
-- Remove faulty patch for WPA authentication
-
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial release
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index ce46b676b..36323f4e2 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -175,4 +175,3 @@ echo yes | python ../configure.py \
 %changelog
 * Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
 - Initial release for TDE R14, using 'tqt3' instead of 'qt3'
-
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
index 1112dfbbb..b8bbfb5c8 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -14,19 +14,19 @@
 
 %define _docdir %{tde_datadir}/doc
 
-Name:		trinity-tqca-tls
-Version:	1.0
-Release:	3%{?dist}%{?_variant}
+Name:			trinity-tqca-tls
+Version:		1.0
+Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
 
-Summary:	TLS plugin for the TQt Cryptographic Architecture
-License:	LGPLv2+
-Group:		Applications/Internet
+Summary:		TLS plugin for the TQt Cryptographic Architecture
+License:		LGPLv2+
+Group:			Applications/Internet
 
-URL:		http://delta.affinix.com/qca/
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:			http://delta.affinix.com/qca/
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
@@ -79,6 +79,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 %doc README COPYING
 %{_libdir}/tqt3/plugins/crypto/libqca-tls.so
 
+
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
 - Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 083cfcf91..1a0686928 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -117,7 +117,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 
 
-
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
 - Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 9c7169d79..aa2813914 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -26,6 +26,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Patch1:		tqt3-14.0.0-shared_lib.patch
 # [tqt3] Fix FTBFS
 Patch2:		tqt3-14.0.0-fix_ftbfs.patch
+# [tqt3] Fix GLIB initialization
+Patch3:		tqt3-14.0.0-fix_glib_init.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
@@ -428,6 +430,7 @@ for the TQt 3 toolkit.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .sharedlibs
 %patch2 -p1 -b .ftbfs
+%patch3 -p1 -b .glibinit
 
 %build
 unset QTDIR QTINC QTLIB
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
index d8cacece0..b6f168c63 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
+++ b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
@@ -16,7 +16,7 @@
 %define tde_mandir %{tde_datadir}/man
 %define tde_appdir %{tde_datadsir}/applications
 
-%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdeappdir %{tde_appdir}/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
@@ -26,7 +26,7 @@
 
 Name:		trinity-%{tdecomp}
 Summary:	Perl bindings for the TQt library
-Version:	14.0.0
+Version:	3.008
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 
 License:	GPLv2+
@@ -39,7 +39,7 @@ URL:		http://www.trinitydesktop.org/
 Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Patch0:		libtqt-perl-14.0.0-ftbfs.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
@@ -48,7 +48,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	trinity-libsmokeqt-devel
+BuildRequires:	trinity-libsmoketqt-devel >= %{tde_version}
 
 %description
 This module lets you use the TQt library from Perl.
@@ -78,7 +78,7 @@ It provides an object-oriented interface and is easy to use.
 %{perl_vendorarch}/TQt/properties.pm
 %{perl_vendorarch}/TQt/signals.pm
 %{perl_vendorarch}/TQt/slots.pm
-%{perl_vendorarch}/auto/TQt/TQt.so
+%{perl_vendorarch}/auto/TQt/
 %{_mandir}/man3/TQt.3pm.*
 
 ##########
@@ -90,7 +90,7 @@ It provides an object-oriented interface and is easy to use.
 ##########
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch0 -p1 -b .ftbfs
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
@@ -121,11 +121,13 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+%__rm -f %{buildroot}%{perl_archlib}/perllocal.pod
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %Changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.008-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec
index f15a9c263..d32a0bc25 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec
@@ -26,7 +26,7 @@ BuildRequires:	autoconf automake libtool m4
 Name:			trinity-%{tde_pkg}
 Summary:		Internationalization support for Trinity
 Version:		14.0.0
-Release:		%{?!preversion:1}%{?preversion:_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 
 Vendor:			Trinity Project
 Packager:		Francois Andriot <francois.andriot@free.fr>
diff --git a/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch b/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch
index 3619f122d..d066256cd 100644
--- a/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch
+++ b/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch
@@ -11,14 +11,14 @@
  my $qt_inc = "@qt_includes@";
  my $qt_lib = "@qt_libraries@";
  
---- trinity-tdebindings-14.0.0~pre209+0615ff79/smoke/kde/Makefile.am.ORI	2013-07-02 21:30:55.952456509 +0200
-+++ trinity-tdebindings-14.0.0~pre209+0615ff79/smoke/kde/Makefile.am	2013-07-02 21:31:07.962573744 +0200
+--- trinity-tdebindings-14.0.0~pre209+0615ff79/smoke/tde/Makefile.am.ORI	2013-07-02 21:30:55.952456509 +0200
++++ trinity-tdebindings-14.0.0~pre209+0615ff79/smoke/tde/Makefile.am	2013-07-02 21:31:07.962573744 +0200
 @@ -9,7 +9,7 @@
- libsmokekde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
+ libsmoketde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
  
  # the libraries to link against.
--libsmokekde_la_LIBADD   = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx
-+libsmokekde_la_LIBADD   = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx -lknewstuff -ltdemdi
+-libsmoketde_la_LIBADD   = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx
++libsmoketde_la_LIBADD   = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx -lknewstuff -ltdemdi
  
  x_sources =  x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
     x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index dc72026fe..873e4b0b7 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -184,8 +184,8 @@ Provides:	trinity-kdebindings = %{version}-%{release}
 
 # Metapackage requires
 Requires: trinity-tdebindings-java = %{version}-%{release}
-Requires: trinity-libsmokeqt1 = %{version}-%{release}
-Requires: trinity-libsmokekde1 = %{version}-%{release}
+Requires: trinity-libsmoketqt = %{version}-%{release}
+Requires: trinity-libsmoketde = %{version}-%{release}
 Requires: trinity-perl-dcop = %{version}-%{release}
 Requires: trinity-python-dcop = %{version}-%{release}
 Requires: trinity-libkjsembed1 = %{version}-%{release}
@@ -406,35 +406,41 @@ This package is part of the official TDE bindings module.
 
 ##########
 
-%package -n trinity-libsmokeqt1
+%package -n trinity-libsmoketqt
 Summary:	SMOKE Binding Library to Qt
 Group:		Environment/Libraries
 
-%description -n trinity-libsmokeqt1
+Obsoletes:	trinity-libsmokeqt1 < %{version}-%{release}
+Provides:	trinity-libsmokeqt1 = %{version}-%{release}
+
+%description -n trinity-libsmoketqt
 The "Scripting Meta Object Kompiler Engine" library is used by
 various TDE language bindings packages to provide interfaces to the
 Qt library.
 
 This package is part of the official TDE bindings module.
 
-%files -n trinity-libsmokeqt1
+%files -n trinity-libsmoketqt
 %defattr(-,root,root,-)
-%{tde_libdir}/libsmokeqt.so.*
+%{tde_libdir}/libsmoketqt.so.*
 
-%post -n trinity-libsmokeqt1
+%post -n trinity-libsmoketqt
 /sbin/ldconfig || :
 
-%postun -n trinity-libsmokeqt1
+%postun -n trinity-libsmoketqt
 /sbin/ldconfig || :
 
 ##########
 
-%package -n trinity-libsmokeqt-devel
+%package -n trinity-libsmoketqt-devel
 Summary:	SMOKE Binding Library to Qt - Development Files
 Group:		Development/Libraries
-Requires:	trinity-libsmokeqt1 = %{version}-%{release}
+Requires:	trinity-libsmoketqt = %{version}-%{release}
+
+Obsoletes:	trinity-libsmokeqt-devel < %{version}-%{release}
+Provides:	trinity-libsmokeqt-devel = %{version}-%{release}
 
-%description -n trinity-libsmokeqt-devel
+%description -n trinity-libsmoketqt-devel
 The "Scripting Meta Object Kompiler Engine" library is used by
 various TDE language bindings packages to provide interfaces to the
 Qt library. This package contains the development files for the
@@ -445,49 +451,55 @@ package.
 
 This package is part of the official TDE bindings module.
 
-%files -n trinity-libsmokeqt-devel
+%files -n trinity-libsmoketqt-devel
 %defattr(-,root,root,-)
 %{tde_tdeincludedir}/smoke.h
-%{tde_libdir}/libsmokeqt.so
-%{tde_libdir}/libsmokeqt.la
+%{tde_libdir}/libsmoketqt.so
+%{tde_libdir}/libsmoketqt.la
 
-%post -n trinity-libsmokeqt-devel
+%post -n trinity-libsmoketqt-devel
 /sbin/ldconfig || :
 
-%postun -n trinity-libsmokeqt-devel
+%postun -n trinity-libsmoketqt-devel
 /sbin/ldconfig || :
 
 ##########
 
-%package -n trinity-libsmokekde1
+%package -n trinity-libsmoketde
 Summary:	SMOKE Binding Library to TDE
 Group:		Environment/Libraries
 
-%description -n trinity-libsmokekde1
+Obsoletes:	trinity-libsmokekde1 < %{version}-%{release}
+Provides:	trinity-libsmokekde1 = %{version}-%{release}
+
+%description -n trinity-libsmoketde
 The "Scripting Meta Object Kompiler Engine" library is used by
 various TDE language bindings packages to provide interfaces to the
 TDE libraries.
 
 This package is part of the official TDE bindings module.
 
-%files -n trinity-libsmokekde1
+%files -n trinity-libsmoketde
 %defattr(-,root,root,-)
-%{tde_libdir}/libsmokekde.so.*
+%{tde_libdir}/libsmoketde.so.*
 
-%post -n trinity-libsmokekde1
+%post -n trinity-libsmoketde
 /sbin/ldconfig || :
 
-%postun -n trinity-libsmokekde1
+%postun -n trinity-libsmoketde
 /sbin/ldconfig || :
 
 ##########
 
-%package -n trinity-libsmokekde-devel
+%package -n trinity-libsmoketde-devel
 Summary:	SMOKE Binding Library to TDE - Development Files
 Group:		Development/Libraries
-Requires:	trinity-libsmokekde1 = %{version}-%{release}
+Requires:	trinity-libsmoketde = %{version}-%{release}
+
+Obsoletes:	trinity-libsmokekde-devel < %{version}-%{release}
+Provides:	trinity-libsmokekde-devel = %{version}-%{release}
 
-%description -n trinity-libsmokekde-devel
+%description -n trinity-libsmoketde-devel
 The "Scripting Meta Object Kompiler Engine" library is used by
 various TDE language bindings packages to provide interfaces to the
 Qt and TDE libraries. This package contains the development files for
@@ -498,15 +510,15 @@ package.
 
 This package is part of the official TDE bindings module.
 
-%files -n trinity-libsmokekde-devel
+%files -n trinity-libsmoketde-devel
 %defattr(-,root,root,-)
-%{tde_libdir}/libsmokekde.so
-%{tde_libdir}/libsmokekde.la
+%{tde_libdir}/libsmoketde.so
+%{tde_libdir}/libsmoketde.la
 
-%post -n trinity-libsmokekde-devel
+%post -n trinity-libsmoketde-devel
 /sbin/ldconfig || :
 
-%postun -n trinity-libsmokekde-devel
+%postun -n trinity-libsmoketde-devel
 /sbin/ldconfig || :
 
 ##########
@@ -941,7 +953,7 @@ Obsoletes:	trinity-kdebindings-devel < %{version}-%{release}
 Provides:	trinity-kdebindings-devel = %{version}-%{release}
 
 # Metapackage
-Requires:	trinity-libsmokeqt-devel = %{version}-%{release}
+Requires:	trinity-libsmoketqt-devel = %{version}-%{release}
 Requires:	trinity-libdcop3-java-devel = %{version}-%{release}
 Requires:	trinity-libsmokekde-devel = %{version}-%{release}
 Requires:	trinity-libkjsembed-devel = %{version}-%{release}
diff --git a/ubuntu/lucid_automake/kdebindings/debian/libsmokekde-kde3-dev.install b/ubuntu/lucid_automake/kdebindings/debian/libsmoketde-kde3-dev.install
index f0bc5013c..f0bc5013c 100644
--- a/ubuntu/lucid_automake/kdebindings/debian/libsmokekde-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdebindings/debian/libsmoketde-kde3-dev.install
diff --git a/ubuntu/lucid_automake/kdebindings/debian/libsmokekde-kde3-dev.links b/ubuntu/lucid_automake/kdebindings/debian/libsmoketde-kde3-dev.links
index c01df2ee2..c01df2ee2 100644
--- a/ubuntu/lucid_automake/kdebindings/debian/libsmokekde-kde3-dev.links
+++ b/ubuntu/lucid_automake/kdebindings/debian/libsmoketde-kde3-dev.links
diff --git a/ubuntu/lucid_automake/kdebindings/debian/libsmokekde1-kde3.install b/ubuntu/lucid_automake/kdebindings/debian/libsmoketde1-kde3.install
index 0530774ab..0530774ab 100644
--- a/ubuntu/lucid_automake/kdebindings/debian/libsmokekde1-kde3.install
+++ b/ubuntu/lucid_automake/kdebindings/debian/libsmoketde1-kde3.install
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/control b/ubuntu/maverick/libraries/libtqt-perl/debian/control
index 3bef4f1d3..5be93f4a3 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/control
+++ b/ubuntu/maverick/libraries/libtqt-perl/debian/control
@@ -3,7 +3,7 @@ Section: perl
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bart Martens <bartm@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
 Build-Conflicts: libtqt-perl
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/rules b/ubuntu/maverick/libraries/libtqt-perl/debian/rules
index 1d77c70fc..5efe954b5 100755
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/rules
+++ b/ubuntu/maverick/libraries/libtqt-perl/debian/rules
@@ -15,7 +15,7 @@ SAVERESTORE=\
 	Makefile.in \
 	puic/Makefile.in \
 	smoke/Makefile.in \
-	smoke/qt/Makefile.in \
+	smoke/tqt/Makefile.in \
 	PerlTQt/bin \
 
 DEB_AUTO_UPDATE_AUTOCONF := 2.61
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/maverick/metapackages/rename-meta/debian/control
index 8a3c151cb..bfc710599 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/control
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/control
@@ -1146,6 +1146,18 @@ Depends: tdebindings-java-trinity
 Conflicts: kdebindings-java-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: libsmokeqt1-trinity
+Architecture: all
+Depends: libsmoketqt1-trinity
+Conflicts: libsmokeqt1-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: libsmokeqt-trinity-dev
+Architecture: all
+Depends: libsmoketqt-trinity-dev
+Conflicts: libsmokeqt-trinity-dev (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: libsmokekde1-trinity
 Architecture: all
 Depends: libsmoketde1-trinity
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control
index 012a9cae0..ad28b4291 100644
--- a/ubuntu/maverick/tdebindings/debian/control
+++ b/ubuntu/maverick/tdebindings/debian/control
@@ -124,29 +124,29 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt1-trinity
+Package: libsmoketqt1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokeqt1-kde3 (<< 4:14.0.0), libsmokeqt1-trinity (<< 4:14.0.0)
 Breaks: libsmokeqt1-kde3 (<< 4:14.0.0), libsmokeqt1-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Description: SMOKE Binding Library to Qt
+Description: SMOKE Binding Library to TQt
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library.
+ TQt library.
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt-trinity-dev
+Package: libsmoketqt-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokeqt-kde3-dev (<< 4:14.0.0), libsmokeqt-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokeqt-kde3-dev (<< 4:14.0.0), libsmokeqt-trinity-dev (<< 4:14.0.0)
-Depends: libsmokeqt1-trinity (= ${binary:Version})
-Description: SMOKE Binding Library to Qt - Development Files
+Depends: libsmoketqt1-trinity (= ${binary:Version})
+Description: SMOKE Binding Library to TQt - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library. This package contains the development files for the
+ TQt library. This package contains the development files for the
  library.
  .
  If you are a normal Debian user, you probably don't need this
@@ -154,7 +154,7 @@ Description: SMOKE Binding Library to Qt - Development Files
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde1-trinity
+Package: libsmoketde1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokekde1-kde3 (<< 4:14.0.0), libsmokekde1-trinity (<< 4:14.0.0)
@@ -167,12 +167,12 @@ Description: SMOKE Binding Library to TDE
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde-trinity-dev
+Package: libsmoketde-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokekde-kde3-dev (<< 4:14.0.0), libsmokekde-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokekde-kde3-dev (<< 4:14.0.0), libsmokekde-trinity-dev (<< 4:14.0.0)
-Depends: libsmokekde1-trinity (= ${binary:Version})
+Depends: libsmoketde1-trinity (= ${binary:Version})
 Description: SMOKE Binding Library to TDE - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
diff --git a/ubuntu/maverick/tdebindings/debian/libsmokekde-trinity-dev.install b/ubuntu/maverick/tdebindings/debian/libsmokekde-trinity-dev.install
deleted file mode 100644
index 85021cc40..000000000
--- a/ubuntu/maverick/tdebindings/debian/libsmokekde-trinity-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so
-debian/tmp/opt/trinity/lib/libsmokekde.la
diff --git a/ubuntu/maverick/tdebindings/debian/libsmokekde-trinity-dev.links b/ubuntu/maverick/tdebindings/debian/libsmokekde-trinity-dev.links
deleted file mode 100644
index da4b8e1a2..000000000
--- a/ubuntu/maverick/tdebindings/debian/libsmokekde-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokekde1 /opt/trinity/share/doc/libsmokekde-dev
diff --git a/ubuntu/maverick/tdebindings/debian/libsmokekde1-trinity.install b/ubuntu/maverick/tdebindings/debian/libsmokekde1-trinity.install
deleted file mode 100644
index 173913313..000000000
--- a/ubuntu/maverick/tdebindings/debian/libsmokekde1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokekde.so.1
diff --git a/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install b/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install
deleted file mode 100644
index 99a21c1de..000000000
--- a/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/include/tde/smoke.h
-debian/tmp/opt/trinity/lib/libsmokeqt.so
-debian/tmp/opt/trinity/lib/libsmokeqt.la
diff --git a/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.links b/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.links
deleted file mode 100644
index ba0272c14..000000000
--- a/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokeqt1 /opt/trinity/share/doc/libsmokeqt-dev
diff --git a/ubuntu/maverick/tdebindings/debian/libsmokeqt1-trinity.install b/ubuntu/maverick/tdebindings/debian/libsmokeqt1-trinity.install
deleted file mode 100644
index 3bf2b300b..000000000
--- a/ubuntu/maverick/tdebindings/debian/libsmokeqt1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.install b/ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.install
new file mode 100644
index 000000000..ccc7952cf
--- /dev/null
+++ b/ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so
+debian/tmp/opt/trinity/lib/libsmoketde.la
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.links b/ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.links
new file mode 100644
index 000000000..bc9055637
--- /dev/null
+++ b/ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketde1 /opt/trinity/share/doc/libsmoketde-dev
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketde1-trinity.install b/ubuntu/maverick/tdebindings/debian/libsmoketde1-trinity.install
new file mode 100644
index 000000000..d36233050
--- /dev/null
+++ b/ubuntu/maverick/tdebindings/debian/libsmoketde1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketde.so.1
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.install b/ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.install
new file mode 100644
index 000000000..663329673
--- /dev/null
+++ b/ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/include/tde/smoke.h
+debian/tmp/opt/trinity/lib/libsmoketqt.so
+debian/tmp/opt/trinity/lib/libsmoketqt.la
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.links b/ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.links
new file mode 100644
index 000000000..36cc65f6e
--- /dev/null
+++ b/ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketqt1 /opt/trinity/share/doc/libsmoketqt-dev
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketqt1-trinity.install b/ubuntu/maverick/tdebindings/debian/libsmoketqt1-trinity.install
new file mode 100644
index 000000000..9b2cbbe21
--- /dev/null
+++ b/ubuntu/maverick/tdebindings/debian/libsmoketqt1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1
diff --git a/ubuntu/maverick/tdebindings/debian/rules b/ubuntu/maverick/tdebindings/debian/rules
index b503f7580..2a486617b 100755
--- a/ubuntu/maverick/tdebindings/debian/rules
+++ b/ubuntu/maverick/tdebindings/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 
 # These are not all the packages with libraries, but only those that
 # need to be in DEB_SHLIBDEPS_INCLUDE...
-PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity
+PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
@@ -63,10 +63,10 @@ clean::
 	rm -f dcopjava/binding/libjavadcop.la
 	rm -f dcopjava/binding/org_kde_DCOP_Client.h
 	rm -f dcopjava/dcopidl2java/dcopidl2java.all_cpp.cpp
-	rm -f smoke/kde/qtdefines
-	rm -f smoke/kde/smokedata.cpp.diff
-	rm -f smoke/qt/qtdefines
-	rm -f smoke/qt/smokedata.cpp.diff
+	rm -f smoke/tde/qtdefines
+	rm -f smoke/tde/smokedata.cpp.diff
+	rm -f smoke/tqt/qtdefines
+	rm -f smoke/tqt/smokedata.cpp.diff
 
 
 common-build-indep:: stamp-build-dcopjava
@@ -138,5 +138,5 @@ common-binary-post-install-indep::
 
 PACKAGES_WITH_USD_SYMLINK = tdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \
 			    libdcop3-java-trinity-dev libdcop3-java-trinity \
-			    libsmokekde-trinity-dev libsmokeqt-trinity-dev \
+			    libsmoketde-trinity-dev libsmoketqt-trinity-dev \
 			    kjscmd-trinity libkjsembed-trinity-dev
diff --git a/ubuntu/maverick_automake/kdebindings/debian/libsmokekde-kde3-dev.install b/ubuntu/maverick_automake/kdebindings/debian/libsmoketde-kde3-dev.install
index f0bc5013c..f0bc5013c 100644
--- a/ubuntu/maverick_automake/kdebindings/debian/libsmokekde-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdebindings/debian/libsmoketde-kde3-dev.install
diff --git a/ubuntu/maverick_automake/kdebindings/debian/libsmokekde-kde3-dev.links b/ubuntu/maverick_automake/kdebindings/debian/libsmoketde-kde3-dev.links
index c01df2ee2..c01df2ee2 100644
--- a/ubuntu/maverick_automake/kdebindings/debian/libsmokekde-kde3-dev.links
+++ b/ubuntu/maverick_automake/kdebindings/debian/libsmoketde-kde3-dev.links
diff --git a/ubuntu/maverick_automake/kdebindings/debian/libsmokekde1-kde3.install b/ubuntu/maverick_automake/kdebindings/debian/libsmoketde1-kde3.install
index 0530774ab..0530774ab 100644
--- a/ubuntu/maverick_automake/kdebindings/debian/libsmokekde1-kde3.install
+++ b/ubuntu/maverick_automake/kdebindings/debian/libsmoketde1-kde3.install
diff --git a/ubuntu/precise/libraries/libtqt-perl/debian/control b/ubuntu/precise/libraries/libtqt-perl/debian/control
index 3bef4f1d3..5be93f4a3 100644
--- a/ubuntu/precise/libraries/libtqt-perl/debian/control
+++ b/ubuntu/precise/libraries/libtqt-perl/debian/control
@@ -3,7 +3,7 @@ Section: perl
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bart Martens <bartm@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
 Build-Conflicts: libtqt-perl
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/precise/libraries/libtqt-perl/debian/rules b/ubuntu/precise/libraries/libtqt-perl/debian/rules
index 1d77c70fc..5efe954b5 100755
--- a/ubuntu/precise/libraries/libtqt-perl/debian/rules
+++ b/ubuntu/precise/libraries/libtqt-perl/debian/rules
@@ -15,7 +15,7 @@ SAVERESTORE=\
 	Makefile.in \
 	puic/Makefile.in \
 	smoke/Makefile.in \
-	smoke/qt/Makefile.in \
+	smoke/tqt/Makefile.in \
 	PerlTQt/bin \
 
 DEB_AUTO_UPDATE_AUTOCONF := 2.61
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/control b/ubuntu/precise/metapackages/rename-meta/debian/control
index 8a3c151cb..bfc710599 100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/control
+++ b/ubuntu/precise/metapackages/rename-meta/debian/control
@@ -1146,6 +1146,18 @@ Depends: tdebindings-java-trinity
 Conflicts: kdebindings-java-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: libsmokeqt1-trinity
+Architecture: all
+Depends: libsmoketqt1-trinity
+Conflicts: libsmokeqt1-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: libsmokeqt-trinity-dev
+Architecture: all
+Depends: libsmoketqt-trinity-dev
+Conflicts: libsmokeqt-trinity-dev (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: libsmokekde1-trinity
 Architecture: all
 Depends: libsmoketde1-trinity
diff --git a/ubuntu/precise/tdebindings/debian/control b/ubuntu/precise/tdebindings/debian/control
index 012a9cae0..ad28b4291 100644
--- a/ubuntu/precise/tdebindings/debian/control
+++ b/ubuntu/precise/tdebindings/debian/control
@@ -124,29 +124,29 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt1-trinity
+Package: libsmoketqt1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokeqt1-kde3 (<< 4:14.0.0), libsmokeqt1-trinity (<< 4:14.0.0)
 Breaks: libsmokeqt1-kde3 (<< 4:14.0.0), libsmokeqt1-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Description: SMOKE Binding Library to Qt
+Description: SMOKE Binding Library to TQt
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library.
+ TQt library.
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt-trinity-dev
+Package: libsmoketqt-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokeqt-kde3-dev (<< 4:14.0.0), libsmokeqt-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokeqt-kde3-dev (<< 4:14.0.0), libsmokeqt-trinity-dev (<< 4:14.0.0)
-Depends: libsmokeqt1-trinity (= ${binary:Version})
-Description: SMOKE Binding Library to Qt - Development Files
+Depends: libsmoketqt1-trinity (= ${binary:Version})
+Description: SMOKE Binding Library to TQt - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library. This package contains the development files for the
+ TQt library. This package contains the development files for the
  library.
  .
  If you are a normal Debian user, you probably don't need this
@@ -154,7 +154,7 @@ Description: SMOKE Binding Library to Qt - Development Files
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde1-trinity
+Package: libsmoketde1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokekde1-kde3 (<< 4:14.0.0), libsmokekde1-trinity (<< 4:14.0.0)
@@ -167,12 +167,12 @@ Description: SMOKE Binding Library to TDE
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde-trinity-dev
+Package: libsmoketde-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokekde-kde3-dev (<< 4:14.0.0), libsmokekde-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokekde-kde3-dev (<< 4:14.0.0), libsmokekde-trinity-dev (<< 4:14.0.0)
-Depends: libsmokekde1-trinity (= ${binary:Version})
+Depends: libsmoketde1-trinity (= ${binary:Version})
 Description: SMOKE Binding Library to TDE - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
diff --git a/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.install b/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.install
deleted file mode 100644
index 85021cc40..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so
-debian/tmp/opt/trinity/lib/libsmokekde.la
diff --git a/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.links b/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.links
deleted file mode 100644
index da4b8e1a2..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokekde-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokekde1 /opt/trinity/share/doc/libsmokekde-dev
diff --git a/ubuntu/precise/tdebindings/debian/libsmokekde1-trinity.install b/ubuntu/precise/tdebindings/debian/libsmokekde1-trinity.install
deleted file mode 100644
index 173913313..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokekde1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokekde.so.1
diff --git a/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.install b/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.install
deleted file mode 100644
index 99a21c1de..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/include/tde/smoke.h
-debian/tmp/opt/trinity/lib/libsmokeqt.so
-debian/tmp/opt/trinity/lib/libsmokeqt.la
diff --git a/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.links b/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.links
deleted file mode 100644
index ba0272c14..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokeqt-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokeqt1 /opt/trinity/share/doc/libsmokeqt-dev
diff --git a/ubuntu/precise/tdebindings/debian/libsmokeqt1-trinity.install b/ubuntu/precise/tdebindings/debian/libsmokeqt1-trinity.install
deleted file mode 100644
index 3bf2b300b..000000000
--- a/ubuntu/precise/tdebindings/debian/libsmokeqt1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.install b/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.install
new file mode 100644
index 000000000..ccc7952cf
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so
+debian/tmp/opt/trinity/lib/libsmoketde.la
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.links b/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.links
new file mode 100644
index 000000000..bc9055637
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketde-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketde1 /opt/trinity/share/doc/libsmoketde-dev
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketde1-trinity.install b/ubuntu/precise/tdebindings/debian/libsmoketde1-trinity.install
new file mode 100644
index 000000000..d36233050
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketde1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketde.so.1
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.install b/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.install
new file mode 100644
index 000000000..663329673
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/include/tde/smoke.h
+debian/tmp/opt/trinity/lib/libsmoketqt.so
+debian/tmp/opt/trinity/lib/libsmoketqt.la
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.links b/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.links
new file mode 100644
index 000000000..36cc65f6e
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketqt-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketqt1 /opt/trinity/share/doc/libsmoketqt-dev
diff --git a/ubuntu/precise/tdebindings/debian/libsmoketqt1-trinity.install b/ubuntu/precise/tdebindings/debian/libsmoketqt1-trinity.install
new file mode 100644
index 000000000..9b2cbbe21
--- /dev/null
+++ b/ubuntu/precise/tdebindings/debian/libsmoketqt1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1
diff --git a/ubuntu/precise/tdebindings/debian/rules b/ubuntu/precise/tdebindings/debian/rules
index b503f7580..2a486617b 100755
--- a/ubuntu/precise/tdebindings/debian/rules
+++ b/ubuntu/precise/tdebindings/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 
 # These are not all the packages with libraries, but only those that
 # need to be in DEB_SHLIBDEPS_INCLUDE...
-PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity
+PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
@@ -63,10 +63,10 @@ clean::
 	rm -f dcopjava/binding/libjavadcop.la
 	rm -f dcopjava/binding/org_kde_DCOP_Client.h
 	rm -f dcopjava/dcopidl2java/dcopidl2java.all_cpp.cpp
-	rm -f smoke/kde/qtdefines
-	rm -f smoke/kde/smokedata.cpp.diff
-	rm -f smoke/qt/qtdefines
-	rm -f smoke/qt/smokedata.cpp.diff
+	rm -f smoke/tde/qtdefines
+	rm -f smoke/tde/smokedata.cpp.diff
+	rm -f smoke/tqt/qtdefines
+	rm -f smoke/tqt/smokedata.cpp.diff
 
 
 common-build-indep:: stamp-build-dcopjava
@@ -138,5 +138,5 @@ common-binary-post-install-indep::
 
 PACKAGES_WITH_USD_SYMLINK = tdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \
 			    libdcop3-java-trinity-dev libdcop3-java-trinity \
-			    libsmokekde-trinity-dev libsmokeqt-trinity-dev \
+			    libsmoketde-trinity-dev libsmoketqt-trinity-dev \
 			    kjscmd-trinity libkjsembed-trinity-dev
diff --git a/ubuntu/raring/libraries/libtqt-perl/debian/control b/ubuntu/raring/libraries/libtqt-perl/debian/control
index 3bef4f1d3..5be93f4a3 100644
--- a/ubuntu/raring/libraries/libtqt-perl/debian/control
+++ b/ubuntu/raring/libraries/libtqt-perl/debian/control
@@ -3,7 +3,7 @@ Section: perl
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bart Martens <bartm@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmoketqt-trinity-dev, chrpath, libtool (>= 1.5.2)
 Build-Conflicts: libtqt-perl
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/raring/libraries/libtqt-perl/debian/rules b/ubuntu/raring/libraries/libtqt-perl/debian/rules
index 1d77c70fc..5efe954b5 100755
--- a/ubuntu/raring/libraries/libtqt-perl/debian/rules
+++ b/ubuntu/raring/libraries/libtqt-perl/debian/rules
@@ -15,7 +15,7 @@ SAVERESTORE=\
 	Makefile.in \
 	puic/Makefile.in \
 	smoke/Makefile.in \
-	smoke/qt/Makefile.in \
+	smoke/tqt/Makefile.in \
 	PerlTQt/bin \
 
 DEB_AUTO_UPDATE_AUTOCONF := 2.61
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/control b/ubuntu/raring/metapackages/rename-meta/debian/control
index 8a3c151cb..bfc710599 100644
--- a/ubuntu/raring/metapackages/rename-meta/debian/control
+++ b/ubuntu/raring/metapackages/rename-meta/debian/control
@@ -1146,6 +1146,18 @@ Depends: tdebindings-java-trinity
 Conflicts: kdebindings-java-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: libsmokeqt1-trinity
+Architecture: all
+Depends: libsmoketqt1-trinity
+Conflicts: libsmokeqt1-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: libsmokeqt-trinity-dev
+Architecture: all
+Depends: libsmoketqt-trinity-dev
+Conflicts: libsmokeqt-trinity-dev (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: libsmokekde1-trinity
 Architecture: all
 Depends: libsmoketde1-trinity
diff --git a/ubuntu/raring/tdebindings/debian/control b/ubuntu/raring/tdebindings/debian/control
index 012a9cae0..ad28b4291 100644
--- a/ubuntu/raring/tdebindings/debian/control
+++ b/ubuntu/raring/tdebindings/debian/control
@@ -124,29 +124,29 @@ Description: tdelibs bindings for java ( Native libraries ) [Trinity]
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt1-trinity
+Package: libsmoketqt1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokeqt1-kde3 (<< 4:14.0.0), libsmokeqt1-trinity (<< 4:14.0.0)
 Breaks: libsmokeqt1-kde3 (<< 4:14.0.0), libsmokeqt1-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Description: SMOKE Binding Library to Qt
+Description: SMOKE Binding Library to TQt
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library.
+ TQt library.
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokeqt-trinity-dev
+Package: libsmoketqt-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokeqt-kde3-dev (<< 4:14.0.0), libsmokeqt-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokeqt-kde3-dev (<< 4:14.0.0), libsmokeqt-trinity-dev (<< 4:14.0.0)
-Depends: libsmokeqt1-trinity (= ${binary:Version})
-Description: SMOKE Binding Library to Qt - Development Files
+Depends: libsmoketqt1-trinity (= ${binary:Version})
+Description: SMOKE Binding Library to TQt - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
- Qt library. This package contains the development files for the
+ TQt library. This package contains the development files for the
  library.
  .
  If you are a normal Debian user, you probably don't need this
@@ -154,7 +154,7 @@ Description: SMOKE Binding Library to Qt - Development Files
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde1-trinity
+Package: libsmoketde1-trinity
 Architecture: any
 Section: libs
 Replaces: libsmokekde1-kde3 (<< 4:14.0.0), libsmokekde1-trinity (<< 4:14.0.0)
@@ -167,12 +167,12 @@ Description: SMOKE Binding Library to TDE
  .
  This package is part of the official TDE bindings module.
 
-Package: libsmokekde-trinity-dev
+Package: libsmoketde-trinity-dev
 Architecture: any
 Section: libdevel
 Replaces: libsmokekde-kde3-dev (<< 4:14.0.0), libsmokekde-trinity-dev (<< 4:14.0.0)
 Breaks: libsmokekde-kde3-dev (<< 4:14.0.0), libsmokekde-trinity-dev (<< 4:14.0.0)
-Depends: libsmokekde1-trinity (= ${binary:Version})
+Depends: libsmoketde1-trinity (= ${binary:Version})
 Description: SMOKE Binding Library to TDE - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
diff --git a/ubuntu/raring/tdebindings/debian/libsmokekde-trinity-dev.install b/ubuntu/raring/tdebindings/debian/libsmokekde-trinity-dev.install
deleted file mode 100644
index 85021cc40..000000000
--- a/ubuntu/raring/tdebindings/debian/libsmokekde-trinity-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so
-debian/tmp/opt/trinity/lib/libsmokekde.la
diff --git a/ubuntu/raring/tdebindings/debian/libsmokekde-trinity-dev.links b/ubuntu/raring/tdebindings/debian/libsmokekde-trinity-dev.links
deleted file mode 100644
index da4b8e1a2..000000000
--- a/ubuntu/raring/tdebindings/debian/libsmokekde-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokekde1 /opt/trinity/share/doc/libsmokekde-dev
diff --git a/ubuntu/raring/tdebindings/debian/libsmokekde1-trinity.install b/ubuntu/raring/tdebindings/debian/libsmokekde1-trinity.install
deleted file mode 100644
index 173913313..000000000
--- a/ubuntu/raring/tdebindings/debian/libsmokekde1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokekde.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokekde.so.1
diff --git a/ubuntu/raring/tdebindings/debian/libsmokeqt-trinity-dev.install b/ubuntu/raring/tdebindings/debian/libsmokeqt-trinity-dev.install
deleted file mode 100644
index 99a21c1de..000000000
--- a/ubuntu/raring/tdebindings/debian/libsmokeqt-trinity-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/include/tde/smoke.h
-debian/tmp/opt/trinity/lib/libsmokeqt.so
-debian/tmp/opt/trinity/lib/libsmokeqt.la
diff --git a/ubuntu/raring/tdebindings/debian/libsmokeqt-trinity-dev.links b/ubuntu/raring/tdebindings/debian/libsmokeqt-trinity-dev.links
deleted file mode 100644
index ba0272c14..000000000
--- a/ubuntu/raring/tdebindings/debian/libsmokeqt-trinity-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/trinity/share/doc/libsmokeqt1 /opt/trinity/share/doc/libsmokeqt-dev
diff --git a/ubuntu/raring/tdebindings/debian/libsmokeqt1-trinity.install b/ubuntu/raring/tdebindings/debian/libsmokeqt1-trinity.install
deleted file mode 100644
index 3bf2b300b..000000000
--- a/ubuntu/raring/tdebindings/debian/libsmokeqt1-trinity.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1.2.2
-debian/tmp/opt/trinity/lib/libsmokeqt.so.1
diff --git a/ubuntu/raring/tdebindings/debian/libsmoketde-trinity-dev.install b/ubuntu/raring/tdebindings/debian/libsmoketde-trinity-dev.install
new file mode 100644
index 000000000..ccc7952cf
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/libsmoketde-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so
+debian/tmp/opt/trinity/lib/libsmoketde.la
diff --git a/ubuntu/raring/tdebindings/debian/libsmoketde-trinity-dev.links b/ubuntu/raring/tdebindings/debian/libsmoketde-trinity-dev.links
new file mode 100644
index 000000000..bc9055637
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/libsmoketde-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketde1 /opt/trinity/share/doc/libsmoketde-dev
diff --git a/ubuntu/raring/tdebindings/debian/libsmoketde1-trinity.install b/ubuntu/raring/tdebindings/debian/libsmoketde1-trinity.install
new file mode 100644
index 000000000..d36233050
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/libsmoketde1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketde.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketde.so.1
diff --git a/ubuntu/raring/tdebindings/debian/libsmoketqt-trinity-dev.install b/ubuntu/raring/tdebindings/debian/libsmoketqt-trinity-dev.install
new file mode 100644
index 000000000..663329673
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/libsmoketqt-trinity-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/include/tde/smoke.h
+debian/tmp/opt/trinity/lib/libsmoketqt.so
+debian/tmp/opt/trinity/lib/libsmoketqt.la
diff --git a/ubuntu/raring/tdebindings/debian/libsmoketqt-trinity-dev.links b/ubuntu/raring/tdebindings/debian/libsmoketqt-trinity-dev.links
new file mode 100644
index 000000000..36cc65f6e
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/libsmoketqt-trinity-dev.links
@@ -0,0 +1 @@
+/opt/trinity/share/doc/libsmoketqt1 /opt/trinity/share/doc/libsmoketqt-dev
diff --git a/ubuntu/raring/tdebindings/debian/libsmoketqt1-trinity.install b/ubuntu/raring/tdebindings/debian/libsmoketqt1-trinity.install
new file mode 100644
index 000000000..9b2cbbe21
--- /dev/null
+++ b/ubuntu/raring/tdebindings/debian/libsmoketqt1-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1.2.2
+debian/tmp/opt/trinity/lib/libsmoketqt.so.1
diff --git a/ubuntu/raring/tdebindings/debian/rules b/ubuntu/raring/tdebindings/debian/rules
index b503f7580..2a486617b 100755
--- a/ubuntu/raring/tdebindings/debian/rules
+++ b/ubuntu/raring/tdebindings/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 
 # These are not all the packages with libraries, but only those that
 # need to be in DEB_SHLIBDEPS_INCLUDE...
-PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity
+PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmoketqt1-trinity libsmoketde1-trinity libkjsembed1-trinity
 
 # These packages do not ship files in /usr/lib so need not call ldconfig.
 DEB_DH_MAKESHLIBS_ARGS_libtrinity-jni-trinity          = -n
@@ -63,10 +63,10 @@ clean::
 	rm -f dcopjava/binding/libjavadcop.la
 	rm -f dcopjava/binding/org_kde_DCOP_Client.h
 	rm -f dcopjava/dcopidl2java/dcopidl2java.all_cpp.cpp
-	rm -f smoke/kde/qtdefines
-	rm -f smoke/kde/smokedata.cpp.diff
-	rm -f smoke/qt/qtdefines
-	rm -f smoke/qt/smokedata.cpp.diff
+	rm -f smoke/tde/qtdefines
+	rm -f smoke/tde/smokedata.cpp.diff
+	rm -f smoke/tqt/qtdefines
+	rm -f smoke/tqt/smokedata.cpp.diff
 
 
 common-build-indep:: stamp-build-dcopjava
@@ -138,5 +138,5 @@ common-binary-post-install-indep::
 
 PACKAGES_WITH_USD_SYMLINK = tdebindings-java-trinity libtrinity-java-trinity libqt3-java-trinity \
 			    libdcop3-java-trinity-dev libdcop3-java-trinity \
-			    libsmokekde-trinity-dev libsmokeqt-trinity-dev \
+			    libsmoketde-trinity-dev libsmoketqt-trinity-dev \
 			    kjscmd-trinity libkjsembed-trinity-dev