10 files changed, 45 insertions, 44 deletions
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index 054ca5eba..b9f9c5be1 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@@ -26,7 +26,7 @@ Architecture: all
 Replaces: kdelibs-trinity (<< 4:14.0.0)
 Breaks: kdelibs-trinity (<< 4:14.0.0)
 Provides: tdelibs
-Depends: tdelibs4c2a-trinity (>= ${Source-Version}),
+Depends: tdelibs14-trinity (>= ${Source-Version}),
  tdelibs-data-trinity (>= ${Source-Version})
 Description: core libraries from the official Trinity release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -53,11 +53,12 @@ Description: core shared data for all TDE applications
  This package is part of TDE, and a component of the TDE libraries module.
  See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
 
-Package: tdelibs4c2a-trinity
+Package: tdelibs14-trinity
 Section: libs
 Architecture: any
-Replaces: kdelibs4c2a-trinity (<< 4:14.0.0)
-Breaks: kdelibs4c2a-trinity (<< 4:14.0.0)
+Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0), tdelibs4c2a-trinity
+Provides: tdelibs4c2a-trinity
+Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
  tdelibs-data-trinity, libart-2.0-2 (>= 14.0.0), perl, xbase-clients, sudo
 Recommends: xdg-user-dirs, upower
@@ -79,7 +80,7 @@ Section: libdevel
 Architecture: any
 Replaces: kdelibs4-trinity-dev (<< 4:14.0.0)
 Breaks: kdelibs4-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
+Depends: tdelibs14-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
@@ -117,8 +118,8 @@ Architecture: any
 Replaces: kdelibs-trinity-dbg (<< 4:14.0.0)
 Breaks: kdelibs-trinity-dbg (<< 4:14.0.0)
 Priority: extra
-Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
-Depends: tdelibs4c2a-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
+Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs14-trinity-dbg
+Depends: tdelibs14-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
 Description: debugging symbols for tdelibs
  This package contains the debugging symbols associated with tdelibs.
  They will automatically be used by gdb for debugging tdelibs-related
diff --git a/debian/lenny/tdelibs/debian/control.in b/debian/lenny/tdelibs/debian/control.in
index e949855d8..43f0657aa 100644
--- a/debian/lenny/tdelibs/debian/control.in
+++ b/debian/lenny/tdelibs/debian/control.in
@@ -22,7 +22,7 @@ Standards-Version: 3.7.2
 Package: tdelibs
 Section: libs
 Architecture: all
-Depends: tdelibs4c2a (>= ${Source-Version}),
+Depends: tdelibs14 (>= ${Source-Version}),
  tdelibs-data (>= ${Source-Version})
 Description: core libraries from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -52,7 +52,7 @@ Description: core shared data for all KDE applications
  This package is part of KDE, and a component of the KDE libraries module.
  See the 'kde' and 'tdelibs' packages for more information.
 
-Package: tdelibs4c2a
+Package: tdelibs14
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, tdelibs-data (>> ${KDE-Version3}),
@@ -76,7 +76,7 @@ Description: core libraries and binaries for all KDE applications
 Package: tdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
+Depends: tdelibs14 (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
@@ -86,7 +86,7 @@ Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4),
  gettext-kde, tdesdk-scripts
 Provides: tdelibs-dev
-Replaces: tdebase-dev (<< 4:3.4.0), tdelibs4c2a (<< 4:3.5.7.dfsg.1-5)
+Replaces: tdebase-dev (<< 4:3.4.0), tdelibs14 (<< 4:3.5.7.dfsg.1-5)
 Description: development files for the KDE core libraries
  This package contains all the headers and other related files needed
  to compile KDE applications, or develop applications which use the
@@ -111,9 +111,9 @@ Package: tdelibs-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Conflicts: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs4c2a-dbg
-Replaces: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs4c2a-dbg
-Depends: tdelibs4c2a (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
+Conflicts: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs14-dbg
+Replaces: tdelibs4-dbg, tdelibs4c2-dbg, tdelibs14-dbg
+Depends: tdelibs14 (= ${Source-Version}), qt-x11-free-dbg, libc6-dbg [amd64]
 Description: debugging symbols for tdelibs
  This package contains the debugging symbols associated with tdelibs.
  They will automatically be used by gdb for debugging tdelibs-related
diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules
index 8fa1ca6ed..e071e4c83 100755
--- a/debian/lenny/tdelibs/debian/rules
+++ b/debian/lenny/tdelibs/debian/rules
@@ -98,7 +98,7 @@ common-install-prehook-impl::
 	  rm -f LIST; \
 	fi
 
-binary-install/tdelibs4c2a-trinity::
+binary-install/tdelibs14-trinity::
 	mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tdecmshell debian/tdelibs4c2a-trinity/opt/trinity/bin/tdecmshell
+	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.docs b/debian/lenny/tdelibs/debian/tdelibs14-trinity.docs
index e845566c0..e845566c0 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.docs
+++ b/debian/lenny/tdelibs/debian/tdelibs14-trinity.docs
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/lenny/tdelibs/debian/tdelibs14-trinity.install
index a6c084acd..966ef38a4 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs14-trinity.install
@@ -219,7 +219,7 @@ debian/tmp/opt/trinity/lib/trinity/plugins/styles/plastik.so
 debian/tmp/opt/trinity/lib/libartskde.so.1
 debian/tmp/opt/trinity/lib/libartskde.so.1.2.0
 debian/tmp/opt/trinity/lib/libDCOP.so.4
-debian/tmp/opt/trinity/lib/libDCOP.so.4.2.0
+debian/tmp/opt/trinity/lib/libDCOP.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeabc_dir.so.1
 debian/tmp/opt/trinity/lib/libtdeabc_dir.so.1.0.0
 debian/tmp/opt/trinity/lib/libtdeabc_file.so.1
@@ -241,11 +241,11 @@ debian/tmp/opt/trinity/lib/libtdeabc.so.1.2.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0
 debian/tmp/opt/trinity/lib/libkatepartinterfaces.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdecore.so.4
-debian/tmp/opt/trinity/lib/libtdecore.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdecore.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdefakes.so.4
-debian/tmp/opt/trinity/lib/libtdefakes.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdefakes.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdefx.so.4
-debian/tmp/opt/trinity/lib/libtdefx.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdefx.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so
 debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so
@@ -258,23 +258,23 @@ debian/tmp/opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdeio_uiserver.so
 debian/tmp/opt/trinity/lib/libtdeinit_tdelauncher.so
 debian/tmp/opt/trinity/lib/libtdeprint_management.so.4
-debian/tmp/opt/trinity/lib/libtdeprint_management.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeprint_management.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeprint.so.4
-debian/tmp/opt/trinity/lib/libtdeprint.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeprint.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdesasl.so.1
 debian/tmp/opt/trinity/lib/libtdesasl.so.1.2.0
 debian/tmp/opt/trinity/lib/libtdesu.so.4
-debian/tmp/opt/trinity/lib/libtdesu.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdesu.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeui.so.4
-debian/tmp/opt/trinity/lib/libtdeui.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeui.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdednssd.so.1
 debian/tmp/opt/trinity/lib/libtdednssd.so.1.0.0
 debian/tmp/opt/trinity/lib/libtdehtml.so.4
-debian/tmp/opt/trinity/lib/libtdehtml.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdehtml.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0
 debian/tmp/opt/trinity/lib/libtdeimproxy.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdeio.so.4
-debian/tmp/opt/trinity/lib/libtdeio.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdeio.so.14.0.0
 debian/tmp/opt/trinity/lib/libkjava.so.1
 debian/tmp/opt/trinity/lib/libkjava.so.1.0.0
 debian/tmp/opt/trinity/lib/libkjs.so.1
@@ -300,13 +300,13 @@ debian/tmp/opt/trinity/lib/libtdersync.so.0.0.1
 debian/tmp/opt/trinity/lib/libtderesources.so.1
 debian/tmp/opt/trinity/lib/libtderesources.so.1.2.0
 debian/tmp/opt/trinity/lib/libtdescreensaver.so.4
-debian/tmp/opt/trinity/lib/libtdescreensaver.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdescreensaver.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdescript.so.0
 debian/tmp/opt/trinity/lib/libtdescript.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdespell2.so.1
 debian/tmp/opt/trinity/lib/libtdespell2.so.1.0.0
 debian/tmp/opt/trinity/lib/libtdespell.so.4
-debian/tmp/opt/trinity/lib/libtdespell.so.4.2.0
+debian/tmp/opt/trinity/lib/libtdespell.so.14.0.0
 debian/tmp/opt/trinity/lib/libtdetexteditor.so.0
 debian/tmp/opt/trinity/lib/libtdetexteditor.so.0.0.0
 debian/tmp/opt/trinity/lib/libtdeunittest.so.1
diff --git a/debian/lenny/tdelibs/debian/tdelibs14-trinity.lintian b/debian/lenny/tdelibs/debian/tdelibs14-trinity.lintian
new file mode 100644
index 000000000..6272877c3
--- /dev/null
+++ b/debian/lenny/tdelibs/debian/tdelibs14-trinity.lintian
@@ -0,0 +1,15 @@
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs14-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs14-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.manpages b/debian/lenny/tdelibs/debian/tdelibs14-trinity.manpages
index 7c2d23170..7c2d23170 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/debian/lenny/tdelibs/debian/tdelibs14-trinity.manpages
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.postinst b/debian/lenny/tdelibs/debian/tdelibs14-trinity.postinst
index 6dbf5d9e1..6dbf5d9e1 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.postinst
+++ b/debian/lenny/tdelibs/debian/tdelibs14-trinity.postinst
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.presubj b/debian/lenny/tdelibs/debian/tdelibs14-trinity.presubj
index 0213d87a4..0213d87a4 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.presubj
+++ b/debian/lenny/tdelibs/debian/tdelibs14-trinity.presubj
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian
deleted file mode 100644
index 4a5ad60ed..000000000
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ /dev/null
@@ -1,15 +0,0 @@
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
-tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root