Fix Ubuntu -kde3 to -trinity automatic migration

Fix Debian krita to chalk automatic migration

83 files changed, 394 insertions, 394 deletions

diff --git a/ubuntu/maverick/applications/abakus/debian/control b/ubuntu/maverick/applications/abakus/debian/control
index 9c1304ba9..e13fb369f 100644
--- a/ubuntu/maverick/applications/abakus/debian/control
+++ b/ubuntu/maverick/applications/abakus/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: abakus-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: abakus-trinity (<< 4:14.0.0)
-Breaks: abakus-trinity (<< 4:14.0.0)
+Replaces: abakus-kde3 (<< 4:14.0.0), abakus-trinity (<< 4:14.0.0)
+Breaks: abakus-kde3 (<< 4:14.0.0), abakus-trinity (<< 4:14.0.0)
 Description: calculator for KDE [Trinity]
  AbaKus is a complex calculator, which provides
  many different kinds of calculations.
diff --git a/ubuntu/maverick/applications/adept/debian/control b/ubuntu/maverick/applications/adept/debian/control
index 52b7447bf..ad90efd2b 100644
--- a/ubuntu/maverick/applications/adept/debian/control
+++ b/ubuntu/maverick/applications/adept/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.4
 Package: adept-trinity
 Section: tde
 Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
-Replaces: adept-trinity (<< 4:14.0.0)
-Breaks: adept-trinity (<< 4:14.0.0)
+Replaces: adept-kde3 (<< 4:14.0.0), adept-trinity (<< 4:14.0.0)
+Breaks: adept-kde3 (<< 4:14.0.0), adept-trinity (<< 4:14.0.0)
 Architecture: all
 Description: package management suite for Trinity
  These packages belong to the adept suite:
@@ -23,8 +23,8 @@ Description: package management suite for Trinity
 Package: adept-common-trinity
 Section: tde
 Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
-Replaces: adept-common-trinity (<< 4:14.0.0)
-Breaks: adept-common-trinity (<< 4:14.0.0)
+Replaces: adept-common-kde3 (<< 4:14.0.0), adept-common-trinity (<< 4:14.0.0)
+Breaks: adept-common-kde3 (<< 4:14.0.0), adept-common-trinity (<< 4:14.0.0)
 Architecture: all
 Description: package manager for Trinity -- common files
  Icons and other common files for all adept components.
@@ -32,8 +32,8 @@ Description: package manager for Trinity -- common files
 Package: adept-manager-trinity
 Section: tde
 Depends: adept-common-trinity, ${shlibs:Depends}
-Replaces: adept-manager-trinity (<< 4:14.0.0)
-Breaks: adept-manager-trinity (<< 4:14.0.0)
+Replaces: adept-manager-kde3 (<< 4:14.0.0), adept-manager-trinity (<< 4:14.0.0)
+Breaks: adept-manager-kde3 (<< 4:14.0.0), adept-manager-trinity (<< 4:14.0.0)
 Recommends: libtqt-perl
 Architecture: any
 Description: package manager for Trinity
@@ -51,8 +51,8 @@ Description: package manager for Trinity
 Package: adept-installer-trinity
 Section: tde
 Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
-Replaces: adept-installer-trinity (<< 4:14.0.0)
-Breaks: adept-installer-trinity (<< 4:14.0.0)
+Replaces: adept-installer-kde3 (<< 4:14.0.0), adept-installer-trinity (<< 4:14.0.0)
+Breaks: adept-installer-kde3 (<< 4:14.0.0), adept-installer-trinity (<< 4:14.0.0)
 Recommends: libtqt-perl
 Architecture: any
 Description: simple user interface for application management (for Trinity)
@@ -67,8 +67,8 @@ Description: simple user interface for application management (for Trinity)
 Package: adept-updater-trinity
 Section: tde
 Depends: adept-common-trinity, ${shlibs:Depends}
-Replaces: adept-updater-trinity (<< 4:14.0.0)
-Breaks: adept-updater-trinity (<< 4:14.0.0)
+Replaces: adept-updater-kde3 (<< 4:14.0.0), adept-updater-trinity (<< 4:14.0.0)
+Breaks: adept-updater-kde3 (<< 4:14.0.0), adept-updater-trinity (<< 4:14.0.0)
 Recommends: libtqt-perl
 Architecture: any
 Description: system update tool for Trinity
@@ -81,8 +81,8 @@ Description: system update tool for Trinity
 Package: adept-notifier-trinity
 Section: tde
 Depends: ${shlibs:Depends}, adept-updater-trinity, update-notifier-common
-Replaces: adept-notifier-trinity (<< 4:14.0.0)
-Breaks: adept-notifier-trinity (<< 4:14.0.0)
+Replaces: adept-notifier-kde3 (<< 4:14.0.0), adept-notifier-trinity (<< 4:14.0.0)
+Breaks: adept-notifier-kde3 (<< 4:14.0.0), adept-notifier-trinity (<< 4:14.0.0)
 Architecture: any
 Description: system tray notifier of available system updates
  Adept Notifier provides a system tray icon notifying the user of
@@ -92,8 +92,8 @@ Description: system tray notifier of available system updates
 Package: adept-batch-trinity
 Section: tde
 Depends: ${shlibs:Depends}, adept-manager-trinity
-Replaces: adept-batch-trinity (<< 4:14.0.0)
-Breaks: adept-batch-trinity (<< 4:14.0.0)
+Replaces: adept-batch-kde3 (<< 4:14.0.0), adept-batch-trinity (<< 4:14.0.0)
+Breaks: adept-batch-kde3 (<< 4:14.0.0), adept-batch-trinity (<< 4:14.0.0)
 Architecture: any
 Description: command line install for Adept
  Adept Batch lets you install packages with Adept from the
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control b/ubuntu/maverick/applications/amarok.cmake/debian/control
index 49bfcb1c5..34fa852c6 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/control
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/control
@@ -19,8 +19,8 @@ Homepage: http://amarok.kde.org
 Package: amarok-trinity
 Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
-Replaces: amarok-trinity (<< 4:14.0.0)
-Breaks: amarok-trinity (<< 4:14.0.0)
+Replaces: amarok-kde3 (<< 4:14.0.0), amarok-trinity (<< 4:14.0.0)
+Breaks: amarok-kde3 (<< 4:14.0.0), amarok-trinity (<< 4:14.0.0)
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
@@ -49,8 +49,8 @@ Description: versatile and easy to use audio player for Trinity
 Package: amarok-common-trinity
 Architecture: all
 Depends: ruby
-Replaces: amarok-common-trinity (<< 4:14.0.0)
-Breaks: amarok-common-trinity (<< 4:14.0.0)
+Replaces: amarok-common-kde3 (<< 4:14.0.0), amarok-common-trinity (<< 4:14.0.0)
+Breaks: amarok-common-kde3 (<< 4:14.0.0), amarok-common-trinity (<< 4:14.0.0)
 Recommends: amarok-trinity (>= ${source:Version})
 Suggests: libqt0-ruby1.8-trinity, python, python-qt3
 Description: architecture independent files for Amarok [Trinity]
@@ -65,8 +65,8 @@ Description: architecture independent files for Amarok [Trinity]
 Package: amarok-engines-trinity
 Architecture: all
 Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
-Replaces: amarok-engines-trinity (<< 4:14.0.0)
-Breaks: amarok-engines-trinity (<< 4:14.0.0)
+Replaces: amarok-engines-kde3 (<< 4:14.0.0), amarok-engines-trinity (<< 4:14.0.0)
+Breaks: amarok-engines-kde3 (<< 4:14.0.0), amarok-engines-trinity (<< 4:14.0.0)
 Description: output engines for the Amarok music player [Trinity]
  This package serves merely as a reference point if you want to install
  all available Amarok engines. It depends on those Amarok engines that
@@ -76,8 +76,8 @@ Description: output engines for the Amarok music player [Trinity]
 Package: amarok-engine-xine-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: amarok-engine-xine-trinity (<< 4:14.0.0)
-Breaks: amarok-engine-xine-trinity (<< 4:14.0.0)
+Replaces: amarok-engine-xine-kde3 (<< 4:14.0.0), amarok-engine-xine-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-xine-kde3 (<< 4:14.0.0), amarok-engine-xine-trinity (<< 4:14.0.0)
 Recommends: amarok-trinity (= ${binary:Version})
 Description: xine engine for the Amarok audio player [Trinity]
  This package provides the xine engine for Amarok, which you may prefer
@@ -87,8 +87,8 @@ Description: xine engine for the Amarok audio player [Trinity]
 Package: amarok-engine-yauap-trinity
 Architecture: any
 Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0)
-Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0)
+Replaces: amarok-engine-yauap-kde3 (<< 4:14.0.0), amarok-engine-yauap-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-yauap-kde3 (<< 4:14.0.0), amarok-engine-yauap-trinity (<< 4:14.0.0)
 Recommends: amarok-trinity (= ${binary:Version})
 Description: Yauap engine for the Amarok audio player [Trinity]
  This package includes Amarok yauap engine, which provides a frontend
@@ -99,8 +99,8 @@ Description: Yauap engine for the Amarok audio player [Trinity]
 Package: amarok-trinity-dbg
 Priority: extra
 Architecture: any
-Replaces: amarok-trinity-dbg (<< 4:14.0.0)
-Breaks: amarok-trinity-dbg (<< 4:14.0.0)
+Replaces: amarok-kde3-dbg (<< 4:14.0.0), amarok-trinity-dbg (<< 4:14.0.0)
+Breaks: amarok-kde3-dbg (<< 4:14.0.0), amarok-trinity-dbg (<< 4:14.0.0)
 Depends: amarok-trinity (= ${binary:Version})
 Recommends: tdelibs-trinity-dbg
 Description: debugging symbols for Amarok [Trinity]
diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control
index 5b9d8f9ea..abd46fefc 100644
--- a/ubuntu/maverick/applications/amarok/debian/control
+++ b/ubuntu/maverick/applications/amarok/debian/control
@@ -19,8 +19,8 @@ Homepage: http://amarok.kde.org
 Package: amarok-trinity
 Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
-Replaces: amarok-trinity (<< 4:14.0.0)
-Breaks: amarok-trinity (<< 4:14.0.0)
+Replaces: amarok-kde3 (<< 4:14.0.0), amarok-trinity (<< 4:14.0.0)
+Breaks: amarok-kde3 (<< 4:14.0.0), amarok-trinity (<< 4:14.0.0)
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
@@ -49,8 +49,8 @@ Description: versatile and easy to use audio player for Trinity
 Package: amarok-common-trinity
 Architecture: all
 Depends: ruby
-Replaces: amarok-common-trinity (<< 4:14.0.0)
-Breaks: amarok-common-trinity (<< 4:14.0.0)
+Replaces: amarok-common-kde3 (<< 4:14.0.0), amarok-common-trinity (<< 4:14.0.0)
+Breaks: amarok-common-kde3 (<< 4:14.0.0), amarok-common-trinity (<< 4:14.0.0)
 Recommends: amarok-trinity (>= ${source:Version})
 Suggests: libqt0-ruby1.8-trinity, python, python-qt3
 Description: architecture independent files for Amarok [Trinity]
@@ -65,8 +65,8 @@ Description: architecture independent files for Amarok [Trinity]
 Package: amarok-engines-trinity
 Architecture: all
 Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
-Replaces: amarok-engines-trinity (<< 4:14.0.0)
-Breaks: amarok-engines-trinity (<< 4:14.0.0)
+Replaces: amarok-engines-kde3 (<< 4:14.0.0), amarok-engines-trinity (<< 4:14.0.0)
+Breaks: amarok-engines-kde3 (<< 4:14.0.0), amarok-engines-trinity (<< 4:14.0.0)
 Description: output engines for the Amarok music player [Trinity]
  This package serves merely as a reference point if you want to install
  all available Amarok engines. It depends on those Amarok engines that
@@ -76,8 +76,8 @@ Description: output engines for the Amarok music player [Trinity]
 Package: amarok-engine-xine-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: amarok-engine-xine-trinity (<< 4:14.0.0)
-Breaks: amarok-engine-xine-trinity (<< 4:14.0.0)
+Replaces: amarok-engine-xine-kde3 (<< 4:14.0.0), amarok-engine-xine-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-xine-kde3 (<< 4:14.0.0), amarok-engine-xine-trinity (<< 4:14.0.0)
 Recommends: amarok-trinity (= ${binary:Version})
 Description: xine engine for the Amarok audio player [Trinity]
  This package provides the xine engine for Amarok, which you may prefer
@@ -87,8 +87,8 @@ Description: xine engine for the Amarok audio player [Trinity]
 Package: amarok-engine-yauap-trinity
 Architecture: any
 Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0)
-Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0)
+Replaces: amarok-engine-yauap-kde3 (<< 4:14.0.0), amarok-engine-yauap-trinity (<< 4:14.0.0)
+Breaks: amarok-engine-yauap-kde3 (<< 4:14.0.0), amarok-engine-yauap-trinity (<< 4:14.0.0)
 Recommends: amarok-trinity (= ${binary:Version})
 Description: Yauap engine for the Amarok audio player [Trinity]
  This package includes Amarok yauap engine, which provides a frontend
@@ -99,8 +99,8 @@ Description: Yauap engine for the Amarok audio player [Trinity]
 Package: amarok-trinity-dbg
 Priority: extra
 Architecture: any
-Replaces: amarok-trinity-dbg (<< 4:14.0.0)
-Breaks: amarok-trinity-dbg (<< 4:14.0.0)
+Replaces: amarok-kde3-dbg (<< 4:14.0.0), amarok-trinity-dbg (<< 4:14.0.0)
+Breaks: amarok-kde3-dbg (<< 4:14.0.0), amarok-trinity-dbg (<< 4:14.0.0)
 Depends: amarok-trinity (= ${binary:Version})
 Recommends: tdelibs-trinity-dbg
 Description: debugging symbols for Amarok [Trinity]
diff --git a/ubuntu/maverick/applications/basket/debian/control b/ubuntu/maverick/applications/basket/debian/control
index b78289774..640faa01a 100644
--- a/ubuntu/maverick/applications/basket/debian/control
+++ b/ubuntu/maverick/applications/basket/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.4
 Package: basket-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: basket-trinity (<< 4:14.0.0)
-Breaks: basket-trinity (<< 4:14.0.0)
+Replaces: basket-kde3 (<< 4:14.0.0), basket-trinity (<< 4:14.0.0)
+Breaks: basket-kde3 (<< 4:14.0.0), basket-trinity (<< 4:14.0.0)
 Recommends: basket-kontact-integration-trinity
 Description: a multi-purpose note-taking application for TDE [Trinity]
  This application provides as many baskets (drawers) as you wish; Several
@@ -26,8 +26,8 @@ Description: a multi-purpose note-taking application for TDE [Trinity]
 Package: basket-kontact-integration-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: basket-kontact-integration-trinity (<< 4:14.0.0)
-Breaks: basket-kontact-integration-trinity (<< 4:14.0.0)
+Replaces: basket-kontact-integration-kde3 (<< 4:14.0.0), basket-kontact-integration-trinity (<< 4:14.0.0)
+Breaks: basket-kontact-integration-kde3 (<< 4:14.0.0), basket-kontact-integration-trinity (<< 4:14.0.0)
 Description: a multi-purpose note-taking appliction, Kontact integration [Trinity]
  This application provides as many baskets (drawers) as you wish; Several
  kinds of objects (texts, URLs, images,...) can be drag-n-drop'd into it.
diff --git a/ubuntu/maverick/applications/bibletime/debian/control b/ubuntu/maverick/applications/bibletime/debian/control
index b3ab4a886..8d5770e83 100644
--- a/ubuntu/maverick/applications/bibletime/debian/control
+++ b/ubuntu/maverick/applications/bibletime/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: bibletime-trinity
 Architecture: any
 Section: tde
-Replaces: bibletime-trinity (<< 4:14.0.0)
-Breaks: bibletime-trinity (<< 4:14.0.0)
+Replaces: bibletime-kde3 (<< 4:14.0.0), bibletime-trinity (<< 4:14.0.0)
+Breaks: bibletime-kde3 (<< 4:14.0.0), bibletime-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Recommends: sword-text, sword-dict, sword-comm
 Suggests: bibletime-i18n-trinity
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
index f895ab798..ee66dc9a7 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: compizconfig-backend-tdeconfig-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
-Breaks: compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
+Replaces: compizconfig-backend-kconfig-kde3 (<< 4:14.0.0), compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
+Breaks: compizconfig-backend-kconfig-kde3 (<< 4:14.0.0), compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
 Conflicts: libcompizconfig-backend-tdeconfig-trinity
 Description: TDEConfig [Trinity] Settings library for plugins - OpenCompositing Project
  The OpenCompositing Project brings 3D desktop visual effects that improve
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/control b/ubuntu/maverick/applications/desktop-effects-tde/debian/control
index 205a644a6..d2efdcdc4 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/control
+++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/control
@@ -9,8 +9,8 @@ XS-Python-Version: all
 Package: desktop-effects-tde-trinity
 Architecture: all
 Depends: ${python:Depends}, python-qt4
-Replaces: desktop-effects-kde-trinity (<< 4:14.0.0)
-Breaks: desktop-effects-kde-trinity (<< 4:14.0.0)
+Replaces: desktop-effects-kde-kde3 (<< 4:14.0.0), desktop-effects-kde-trinity (<< 4:14.0.0)
+Breaks: desktop-effects-kde-kde3 (<< 4:14.0.0), desktop-effects-kde-trinity (<< 4:14.0.0)
 XB-Python-Version: ${python:Versions}
 Description: compiz setup tool for Trinity
  A simple Compiz configuration tool for Trinity.  Installs and sets Compiz
diff --git a/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control
index d58bb1ea8..72180b940 100644
--- a/ubuntu/maverick/applications/digikam/debian/control
+++ b/ubuntu/maverick/applications/digikam/debian/control
@@ -16,8 +16,8 @@ Homepage: http://www.digikam.org
 Package: digikam-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: digikam-trinity (<< 4:14.0.0)
-Breaks: digikam-trinity (<< 4:14.0.0)
+Replaces: digikam-kde3 (<< 4:14.0.0), digikam-trinity (<< 4:14.0.0)
+Breaks: digikam-kde3 (<< 4:14.0.0), digikam-trinity (<< 4:14.0.0)
 Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
 Description: digital photo management application for KDE [Trinity]
@@ -43,8 +43,8 @@ Description: digital photo management application for KDE [Trinity]
 Package: showfoto-trinity
 Architecture: any
 Section: graphics
-Replaces: showfoto-trinity (<< 4:14.0.0)
-Breaks: showfoto-trinity (<< 4:14.0.0)
+Replaces: showfoto-kde3 (<< 4:14.0.0), showfoto-trinity (<< 4:14.0.0)
+Breaks: showfoto-kde3 (<< 4:14.0.0), showfoto-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, digikam-trinity
 Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Description: image viewer/editor for KDE [Trinity]
@@ -54,8 +54,8 @@ Description: image viewer/editor for KDE [Trinity]
 Package: digikam-trinity-dbg
 Architecture: any
 Section: devel
-Replaces: digikam-trinity-dbg (<< 4:14.0.0)
-Breaks: digikam-trinity-dbg (<< 4:14.0.0)
+Replaces: digikam-kde3-dbg (<< 4:14.0.0), digikam-trinity-dbg (<< 4:14.0.0)
+Breaks: digikam-kde3-dbg (<< 4:14.0.0), digikam-trinity-dbg (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, digikam-trinity (= ${binary:Version}), showfoto-trinity (= ${binary:Version}), tdelibs-trinity-dbg
 Priority: extra
 Description: debugging symbols for digikam [Trinity]
diff --git a/ubuntu/maverick/applications/dolphin/debian/control b/ubuntu/maverick/applications/dolphin/debian/control
index bf2f1d9e2..b80057cb4 100644
--- a/ubuntu/maverick/applications/dolphin/debian/control
+++ b/ubuntu/maverick/applications/dolphin/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: dolphin-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: dolphin-trinity (<< 4:14.0.0)
-Breaks: dolphin-trinity (<< 4:14.0.0)
+Replaces: dolphin-kde3 (<< 4:14.0.0), dolphin-trinity (<< 4:14.0.0)
+Breaks: dolphin-kde3 (<< 4:14.0.0), dolphin-trinity (<< 4:14.0.0)
 Recommends: amarok-trinity, ark-trinity, k3b-trinity, kmail-trinity, digikam-trinity
 Suggests: kfloppy-trinity
 Description: File manager for KDE focusing on usability [Trinity]
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/control b/ubuntu/maverick/applications/filelight-l10n/debian/control
index 44e93b582..075cbeb5f 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/control
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/control
@@ -10,8 +10,8 @@ Homepage: http://www.methylblue.com/filelight/
 Package: filelight-l10n-trinity
 Architecture: any
 Depends: ${shlibs:Depends} , filelight-trinity
-Replaces: filelight-l10n-trinity (<< 4:14.0.0)
-Breaks: filelight-l10n-trinity (<< 4:14.0.0)
+Replaces: filelight-l10n-kde3 (<< 4:14.0.0), filelight-l10n-trinity (<< 4:14.0.0)
+Breaks: filelight-l10n-kde3 (<< 4:14.0.0), filelight-l10n-trinity (<< 4:14.0.0)
 Description: Localization (l10n) for Filelight, disk space usage tool [Trinity]
  This package provides localization(l10n) files (translations and docs) for
  Filelight, Filelight allows you to understand your disk usage by graphically
diff --git a/ubuntu/maverick/applications/filelight/debian/control b/ubuntu/maverick/applications/filelight/debian/control
index a85cf37fe..e7ed882ae 100644
--- a/ubuntu/maverick/applications/filelight/debian/control
+++ b/ubuntu/maverick/applications/filelight/debian/control
@@ -11,8 +11,8 @@ Homepage: http://www.methylblue.com/filelight/
 Package: filelight-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: filelight-trinity (<< 4:14.0.0)
-Breaks: filelight-trinity (<< 4:14.0.0)
+Replaces: filelight-kde3 (<< 4:14.0.0), filelight-trinity (<< 4:14.0.0)
+Breaks: filelight-kde3 (<< 4:14.0.0), filelight-trinity (<< 4:14.0.0)
 Description: show where your diskspace is being used [Trinity]
  Filelight allows you to understand your disk usage by graphically
  representing your filesystem as a set of concentric, segmented rings.
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/control b/ubuntu/maverick/applications/fusion-icon/debian/control
index 25234c2dd..2b2a5d206 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/control
+++ b/ubuntu/maverick/applications/fusion-icon/debian/control
@@ -11,8 +11,8 @@ Standards-Version: 3.8.4
 Package: fusion-icon-trinity
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Replaces: fusion-icon-trinity (<< 4:14.0.0)
-Breaks: fusion-icon-trinity (<< 4:14.0.0)
+Replaces: fusion-icon-kde3 (<< 4:14.0.0), fusion-icon-trinity (<< 4:14.0.0)
+Breaks: fusion-icon-kde3 (<< 4:14.0.0), fusion-icon-trinity (<< 4:14.0.0)
 Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 | python-qt4, python-compizconfig-trinity, compiz-trinity
 Description: tray icon to launch and manage Compiz Fusion [Trinity]
  The OpenCompositing Project brings 3D desktop visual effects that
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/control b/ubuntu/maverick/applications/gtk-qt-engine/debian/control
index 6c2e14987..bfbe25b3c 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/control
+++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: gtk-qt-engine-trinity
 Architecture: any
 Provides: gtk2-engines-gtk-qt-trinity
-Replaces: gtk-qt-engine-trinity (<< 4:14.0.0)
-Breaks: gtk-qt-engine-trinity (<< 4:14.0.0)
+Replaces: gtk-qt-engine-kde3 (<< 4:14.0.0), gtk-qt-engine-trinity (<< 4:14.0.0)
+Breaks: gtk-qt-engine-kde3 (<< 4:14.0.0), gtk-qt-engine-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: gtk3-tqt-engine
 Description: theme engine using Qt for GTK+ 2.x and Trinity
diff --git a/ubuntu/maverick/applications/gwenview/debian/control b/ubuntu/maverick/applications/gwenview/debian/control
index a28fbdb19..391cf4c2c 100644
--- a/ubuntu/maverick/applications/gwenview/debian/control
+++ b/ubuntu/maverick/applications/gwenview/debian/control
@@ -9,8 +9,8 @@ Homepage: http://gwenview.sourceforge.net
 Package: gwenview-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: gwenview-trinity (<< 4:14.0.0)
-Breaks: gwenview-trinity (<< 4:14.0.0)
+Replaces: gwenview-kde3 (<< 4:14.0.0), gwenview-trinity (<< 4:14.0.0)
+Breaks: gwenview-kde3 (<< 4:14.0.0), gwenview-trinity (<< 4:14.0.0)
 Recommends: tdegraphics-tdefile-plugins-trinity, kipi-plugins-trinity
 Suggests: gwenview-i18n
 Description: image viewer for TDE
diff --git a/ubuntu/maverick/applications/k3b/debian/control b/ubuntu/maverick/applications/k3b/debian/control
index d15a1e0fe..5e28abaa3 100644
--- a/ubuntu/maverick/applications/k3b/debian/control
+++ b/ubuntu/maverick/applications/k3b/debian/control
@@ -11,8 +11,8 @@ Homepage: http://www.k3b.org
 Package: k3b-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, tdelibs-data-trinity (>= 4:3.1.4-2), cdrdao (>= 1.1.7-5), k3b-data-trinity (= ${source:Version}), libk3b3-trinity (= ${binary:Version})
-Replaces: k3b-trinity (<< 4:14.0.0)
-Breaks: k3b-trinity (<< 4:14.0.0)
+Replaces: k3b-kde3 (<< 4:14.0.0), k3b-trinity (<< 4:14.0.0)
+Breaks: k3b-kde3 (<< 4:14.0.0), k3b-trinity (<< 4:14.0.0)
 Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity
 Suggests: k3b-i18n-trinity, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7)
 Description: A sophisticated KDE CD burning application [Trinity]
@@ -31,8 +31,8 @@ Description: A sophisticated KDE CD burning application [Trinity]
 Package: k3b-data-trinity
 Conflicts: k3b-trinity (<< 1.0.4-4)
 Architecture: all
-Replaces: k3b-data-trinity (<< 4:14.0.0)
-Breaks: k3b-data-trinity (<< 4:14.0.0)
+Replaces: k3b-data-kde3 (<< 4:14.0.0), k3b-data-trinity (<< 4:14.0.0)
+Breaks: k3b-data-kde3 (<< 4:14.0.0), k3b-data-trinity (<< 4:14.0.0)
 Description: A sophisticated KDE CD burning application - data files [Trinity]
  K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
@@ -43,8 +43,8 @@ Description: A sophisticated KDE CD burning application - data files [Trinity]
 Package: libk3b-trinity-dev
 Conflicts: libk3bcore-trinity-dev, libk3bplugin-trinity-dev, libk3btools-trinity-dev, libk3bproject-trinity-dev, k3blibs-trinity-dev, k3blibs-trinity
 Section: libdevel
-Replaces: libk3b-trinity-dev (<< 4:14.0.0)
-Breaks: libk3b-trinity-dev (<< 4:14.0.0)
+Replaces: libk3b-kde3-dev (<< 4:14.0.0), libk3b-trinity-dev (<< 4:14.0.0)
+Breaks: libk3b-kde3-dev (<< 4:14.0.0), libk3b-trinity-dev (<< 4:14.0.0)
 Architecture: any
 Depends: libk3b3-trinity (= ${binary:Version})
 Description: The KDE cd burning application library - development files [Trinity]
@@ -57,8 +57,8 @@ Description: The KDE cd burning application library - development files [Trinity
 Package: libk3b3-trinity
 Section: libs
 Architecture: any
-Replaces: libk3b3-trinity (<< 4:14.0.0)
-Breaks: libk3b3-trinity (<< 4:14.0.0)
+Replaces: libk3b3-kde3 (<< 4:14.0.0), libk3b3-trinity (<< 4:14.0.0)
+Breaks: libk3b3-kde3 (<< 4:14.0.0), libk3b3-trinity (<< 4:14.0.0)
 Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity
 Depends: ${shlibs:Depends}
 Description: The KDE cd burning application library - runtime files [Trinity]
@@ -71,8 +71,8 @@ Description: The KDE cd burning application library - runtime files [Trinity]
 Package: libk3b3-extracodecs-trinity
 Section: libs
 Architecture: any
-Replaces: libk3b3-extracodecs-trinity (<< 4:14.0.0)
-Breaks: libk3b3-extracodecs-trinity (<< 4:14.0.0)
+Replaces: libk3b3-extracodecs-kde3 (<< 4:14.0.0), libk3b3-extracodecs-trinity (<< 4:14.0.0)
+Breaks: libk3b3-extracodecs-kde3 (<< 4:14.0.0), libk3b3-extracodecs-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Conflicts: libk3b2-mp3-trinity
 Description: The KDE cd burning application library - extra decoders [Trinity]
@@ -85,8 +85,8 @@ Description: The KDE cd burning application library - extra decoders [Trinity]
 Package: libk3b2-extracodecs-trinity
 Architecture: all
 Priority: extra
-Replaces: libk3b2-extracodecs-trinity (<< 4:14.0.0)
-Breaks: libk3b2-extracodecs-trinity (<< 4:14.0.0)
+Replaces: libk3b2-extracodecs-kde3 (<< 4:14.0.0), libk3b2-extracodecs-trinity (<< 4:14.0.0)
+Breaks: libk3b2-extracodecs-kde3 (<< 4:14.0.0), libk3b2-extracodecs-trinity (<< 4:14.0.0)
 Depends: libk3b3-extracodecs-trinity
 Description: transitional package for K3b's extra decoders [Trinity]
  This is a dummy transitional package to enable a smooth transition from
diff --git a/ubuntu/maverick/applications/k9copy/debian/control b/ubuntu/maverick/applications/k9copy/debian/control
index 2e534d2de..f7d7c6168 100644
--- a/ubuntu/maverick/applications/k9copy/debian/control
+++ b/ubuntu/maverick/applications/k9copy/debian/control
@@ -10,8 +10,8 @@ Homepage: http://k9copy.sourceforge.net/
 Package: k9copy-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, vamps, dvd+rw-tools, dvdauthor, mencoder, libdvdnav4
-Replaces: k9copy-trinity (<< 4:14.0.0)
-Breaks: k9copy-trinity (<< 4:14.0.0)
+Replaces: k9copy-kde3 (<< 4:14.0.0), k9copy-trinity (<< 4:14.0.0)
+Breaks: k9copy-kde3 (<< 4:14.0.0), k9copy-trinity (<< 4:14.0.0)
 Description: DVD backup tool for Trinity
  k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
  to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/control b/ubuntu/maverick/applications/kaffeine-mozilla/debian/control
index 38270dc34..024242d96 100644
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/control
+++ b/ubuntu/maverick/applications/kaffeine-mozilla/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: kaffeine-mozilla-trinity
 Architecture: any
 Depends: kaffeine-trinity, ${shlibs:Depends}, ${misc:Depends}
-Replaces: kaffeine-mozilla-trinity (<< 4:14.0.0)
-Breaks: kaffeine-mozilla-trinity (<< 4:14.0.0)
+Replaces: kaffeine-mozilla-kde3 (<< 4:14.0.0), kaffeine-mozilla-trinity (<< 4:14.0.0)
+Breaks: kaffeine-mozilla-kde3 (<< 4:14.0.0), kaffeine-mozilla-trinity (<< 4:14.0.0)
 Description: mozilla plugin that lanches kaffeine for supported media types [Trinity]
  This mozilla plugin launches kaffeine, the xine-based media player for KDE,
  when a page containing a supported media format is loaded.
diff --git a/ubuntu/maverick/applications/kaffeine/debian/control b/ubuntu/maverick/applications/kaffeine/debian/control
index f91dd770e..327eda275 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/control
+++ b/ubuntu/maverick/applications/kaffeine/debian/control
@@ -15,8 +15,8 @@ Standards-Version: 3.8.4
 Package: kaffeine-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, hdparm, libxine2-x | libxine1-x (<< 1.1.20) | libxine1 (<< 1.1.8-2)
-Replaces: kaffeine-trinity (<< 4:14.0.0)
-Breaks: kaffeine-trinity (<< 4:14.0.0)
+Replaces: kaffeine-kde3 (<< 4:14.0.0), kaffeine-trinity (<< 4:14.0.0)
+Breaks: kaffeine-kde3 (<< 4:14.0.0), kaffeine-trinity (<< 4:14.0.0)
 Description: versatile media player for TDE
  Kaffeine is a media player for KDE. While it supports multiple player
  engines, its default engine is Xine, giving Kaffeine a wide variety of
@@ -31,8 +31,8 @@ Description: versatile media player for TDE
 Package: kaffeine-trinity-dbg
 Section: devel
 Architecture: any
-Replaces: kaffeine-trinity-dbg (<< 4:14.0.0)
-Breaks: kaffeine-trinity-dbg (<< 4:14.0.0)
+Replaces: kaffeine-kde3-dbg (<< 4:14.0.0), kaffeine-trinity-dbg (<< 4:14.0.0)
+Breaks: kaffeine-kde3-dbg (<< 4:14.0.0), kaffeine-trinity-dbg (<< 4:14.0.0)
 Priority: extra
 Depends: kaffeine-trinity (= ${binary:Version}), tdelibs-trinity-dbg
 Description: debugging symbols for kaffeine [Trinity]
@@ -43,8 +43,8 @@ Description: debugging symbols for kaffeine [Trinity]
 Package: kaffeine-gstreamer-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, kaffeine-trinity
-Replaces: kaffeine-gstreamer-trinity (<< 4:14.0.0)
-Breaks: kaffeine-gstreamer-trinity (<< 4:14.0.0)
+Replaces: kaffeine-gstreamer-kde3 (<< 4:14.0.0), kaffeine-gstreamer-trinity (<< 4:14.0.0)
+Breaks: kaffeine-gstreamer-kde3 (<< 4:14.0.0), kaffeine-gstreamer-trinity (<< 4:14.0.0)
 Description: Gstreamer engine for kaffeine media player [Trinity]
  Kaffeine is a media player for KDE. While it supports multiple player
  engines, its default engine is Gstreamer, giving Kaffeine a wide variety of
diff --git a/ubuntu/maverick/applications/katapult/debian/control b/ubuntu/maverick/applications/katapult/debian/control
index cf1f741cc..9c6ae48ce 100644
--- a/ubuntu/maverick/applications/katapult/debian/control
+++ b/ubuntu/maverick/applications/katapult/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: katapult-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: katapult-trinity (<< 4:14.0.0)
-Breaks: katapult-trinity (<< 4:14.0.0)
+Replaces: katapult-kde3 (<< 4:14.0.0), katapult-trinity (<< 4:14.0.0)
+Breaks: katapult-kde3 (<< 4:14.0.0), katapult-trinity (<< 4:14.0.0)
 Description: item launcher for KDE [Trinity]
  Katapult is an application, which analyses text-based queries
  to launch items, such as bookmarks, directories or programs.
diff --git a/ubuntu/maverick/applications/kbarcode/debian/control b/ubuntu/maverick/applications/kbarcode/debian/control
index 27506d32a..f6832668e 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/control
+++ b/ubuntu/maverick/applications/kbarcode/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: kbarcode-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, barcode, imagemagick
-Replaces: kbarcode-trinity (<< 4:14.0.0)
-Breaks: kbarcode-trinity (<< 4:14.0.0)
+Replaces: kbarcode-kde3 (<< 4:14.0.0), kbarcode-trinity (<< 4:14.0.0)
+Breaks: kbarcode-kde3 (<< 4:14.0.0), kbarcode-trinity (<< 4:14.0.0)
 Recommends: libqt3-mt-mysql | libqt3-mt-psql | libqt3-mt-odbc | libqt3-mt-sqlite |
  libqt3-mt-ibase
 Description: barcode and label printing application for Trinity
diff --git a/ubuntu/maverick/applications/kbfx/debian/control b/ubuntu/maverick/applications/kbfx/debian/control
index 5491b3d76..909bc9304 100644
--- a/ubuntu/maverick/applications/kbfx/debian/control
+++ b/ubuntu/maverick/applications/kbfx/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: kbfx-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kbfx-trinity (<< 4:14.0.0)
-Breaks: kbfx-trinity (<< 4:14.0.0)
+Replaces: kbfx-kde3 (<< 4:14.0.0), kbfx-trinity (<< 4:14.0.0)
+Breaks: kbfx-kde3 (<< 4:14.0.0), kbfx-trinity (<< 4:14.0.0)
 Description: an alternative to K-Menu for KDE [Trinity]
  KBFX is an alternative to the classical K-Menu button and its menu.
  It improves the user experience by enabling him to set a bigger (and thus more
diff --git a/ubuntu/maverick/applications/kbookreader/debian/control b/ubuntu/maverick/applications/kbookreader/debian/control
index 7d6fe936b..0e8d6a6e0 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/control
+++ b/ubuntu/maverick/applications/kbookreader/debian/control
@@ -10,8 +10,8 @@ Homepage: http://k9copy.sourceforge.net/
 Package: kbookreader-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kbookreader-trinity (<< 4:14.0.0)
-Breaks: kbookreader-trinity (<< 4:14.0.0)
+Replaces: kbookreader-kde3 (<< 4:14.0.0), kbookreader-trinity (<< 4:14.0.0)
+Breaks: kbookreader-kde3 (<< 4:14.0.0), kbookreader-trinity (<< 4:14.0.0)
 Description: eBook reader for Trinity
  kbookreader is an application which allows you to view eBooks
  within the Trinity Desktop Environment
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/control b/ubuntu/maverick/applications/kchmviewer/debian/control
index f14942fd3..95652896a 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/control
+++ b/ubuntu/maverick/applications/kchmviewer/debian/control
@@ -10,8 +10,8 @@ Homepage: http://www.kchmviewer.net/
 Package: kchmviewer-trinity
 Architecture: any
 Conflicts: kchmviewer-nokde-trinity
-Replaces: kchmviewer-trinity (<< 4:14.0.0)
-Breaks: kchmviewer-trinity (<< 4:14.0.0)
+Replaces: kchmviewer-kde3 (<< 4:14.0.0), kchmviewer-trinity (<< 4:14.0.0)
+Breaks: kchmviewer-kde3 (<< 4:14.0.0), kchmviewer-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CHM viewer for Trinity
  KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
diff --git a/ubuntu/maverick/applications/kcpuload/debian/control b/ubuntu/maverick/applications/kcpuload/debian/control
index 01e3b7803..4856915a7 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/control
+++ b/ubuntu/maverick/applications/kcpuload/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: kcpuload-trinity
 Architecture: any
 Section: tde
-Replaces: kcpuload-trinity (<< 4:14.0.0)
-Breaks: kcpuload-trinity (<< 4:14.0.0)
+Replaces: kcpuload-kde3 (<< 4:14.0.0), kcpuload-trinity (<< 4:14.0.0)
+Breaks: kcpuload-kde3 (<< 4:14.0.0), kcpuload-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: knetload-trinity
 Description: a CPU meter for Kicker [Trinity]
diff --git a/ubuntu/maverick/applications/kdiff3/debian/control b/ubuntu/maverick/applications/kdiff3/debian/control
index fa27ccbdf..2d370d716 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/control
+++ b/ubuntu/maverick/applications/kdiff3/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: kdiff3-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdiff3-trinity (<< 4:14.0.0)
-Breaks: kdiff3-trinity (<< 4:14.0.0)
+Replaces: kdiff3-kde3 (<< 4:14.0.0), kdiff3-trinity (<< 4:14.0.0)
+Breaks: kdiff3-kde3 (<< 4:14.0.0), kdiff3-trinity (<< 4:14.0.0)
 Recommends: kdiff3-trinity-doc
 Description: compares and merges 2 or 3 files or directories [Trinity]
  KDiff3 compares two or three input files and shows the differences
@@ -22,8 +22,8 @@ Description: compares and merges 2 or 3 files or directories [Trinity]
 Package: kdiff3-trinity-doc
 Architecture: all
 Recommends: kdiff3-trinity
-Replaces: kdiff3-trinity-doc (<< 4:14.0.0)
-Breaks: kdiff3-trinity-doc (<< 4:14.0.0)
+Replaces: kdiff3-kde3-doc (<< 4:14.0.0), kdiff3-trinity-doc (<< 4:14.0.0)
+Breaks: kdiff3-kde3-doc (<< 4:14.0.0), kdiff3-trinity-doc (<< 4:14.0.0)
 Description: documentation for kdiff3 [Trinity]
  KDiff3 compares two or three input files and shows the differences
  line by line and character by character. This package contains the 
diff --git a/ubuntu/maverick/applications/kdirstat/debian/control b/ubuntu/maverick/applications/kdirstat/debian/control
index 27e47ff0e..cf89d6df2 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/control
+++ b/ubuntu/maverick/applications/kdirstat/debian/control
@@ -9,8 +9,8 @@ Homepage: http://kdirstat.sourceforge.net/
 Package: kdirstat-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdirstat-trinity (<< 4:14.0.0)
-Breaks: kdirstat-trinity (<< 4:14.0.0)
+Replaces: kdirstat-kde3 (<< 4:14.0.0), kdirstat-trinity (<< 4:14.0.0)
+Breaks: kdirstat-kde3 (<< 4:14.0.0), kdirstat-trinity (<< 4:14.0.0)
 Description: graphical disk usage display with cleanup facilities [Trinity]
  KDirStat (KDE Directory Statistics) is a small utility program that sums
  up disk usage for directory trees, very much like the Unix 'du' command.
diff --git a/ubuntu/maverick/applications/kdpkg/debian/control b/ubuntu/maverick/applications/kdpkg/debian/control
index 15d673216..99b30002a 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/control
+++ b/ubuntu/maverick/applications/kdpkg/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: kdpkg-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, apt, dpkg (>=1.14), sudo-trinity, menu
-Replaces: kdpkg-trinity (<< 4:14.0.0)
-Breaks: kdpkg-trinity (<< 4:14.0.0)
+Replaces: kdpkg-kde3 (<< 4:14.0.0), kdpkg-trinity (<< 4:14.0.0)
+Breaks: kdpkg-kde3 (<< 4:14.0.0), kdpkg-trinity (<< 4:14.0.0)
 Description: KDE frontend for dpkg [Trinity]
  kdpkg is a utility for installing .deb package files.
  It is similar to gdebi, except that kdpkg is a KDE application
diff --git a/ubuntu/maverick/applications/keep/debian/control b/ubuntu/maverick/applications/keep/debian/control
index 0adb5638a..f3213cd45 100644
--- a/ubuntu/maverick/applications/keep/debian/control
+++ b/ubuntu/maverick/applications/keep/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.4
 Package: keep-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, rdiff-backup
-Replaces: keep-trinity (<< 4:14.0.0)
-Breaks: keep-trinity (<< 4:14.0.0)
+Replaces: keep-kde3 (<< 4:14.0.0), keep-trinity (<< 4:14.0.0)
+Breaks: keep-kde3 (<< 4:14.0.0), keep-trinity (<< 4:14.0.0)
 Description: backup system for KDE [Trinity]
  Keep is an automatic backup program that allows users to set the parameters of
  the backup, including the frequency and the number of backups.
diff --git a/ubuntu/maverick/applications/kerry/debian/control b/ubuntu/maverick/applications/kerry/debian/control
index 4875cc69f..4fef01116 100644
--- a/ubuntu/maverick/applications/kerry/debian/control
+++ b/ubuntu/maverick/applications/kerry/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: kerry-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, beagle (>= 0.2.3)
-Replaces: kerry-trinity (<< 4:14.0.0)
-Breaks: kerry-trinity (<< 4:14.0.0)
+Replaces: kerry-kde3 (<< 4:14.0.0), kerry-trinity (<< 4:14.0.0)
+Breaks: kerry-kde3 (<< 4:14.0.0), kerry-trinity (<< 4:14.0.0)
 Description: a KDE frontend for the Beagle desktop search daemon [Trinity]
  Kerry is a Trinity frontend for the Beagle desktop search daemon.
  .
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/control b/ubuntu/maverick/applications/kgtk-qt3/debian/control
index 64808cc78..fe9d6d7ee 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/control
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/control
@@ -9,8 +9,8 @@ Homepage: http://trinity.pearsoncomputing.net
 Package: kgtk-qt3-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kgtk-qt3-trinity (<< 4:14.0.0)
-Breaks: kgtk-qt3-trinity (<< 4:14.0.0)
+Replaces: kgtk-qt3-kde3 (<< 4:14.0.0), kgtk-qt3-trinity (<< 4:14.0.0)
+Breaks: kgtk-qt3-kde3 (<< 4:14.0.0), kgtk-qt3-trinity (<< 4:14.0.0)
 Conflicts: kgtk-config-bluefish, kgtk-config-eclipse, kgtk-config-firefox, kgtk-config-gimp, kgtk-config-inkscape, kgtk-config-kino, kgtk-config-openoffice, kgtk-config-opera-qt3, kgtk-config-opera-qt4, kgtk-config-scribus, kgtk-config-thunderbird, kubuntu-kgtk-trinity
 Description: Use KDE dialogs in Gtk apps
  This is an LD_PRELOAD hack that allows most GTK
diff --git a/ubuntu/maverick/applications/kile/debian/control b/ubuntu/maverick/applications/kile/debian/control
index b39ba1894..94e68eba0 100644
--- a/ubuntu/maverick/applications/kile/debian/control
+++ b/ubuntu/maverick/applications/kile/debian/control
@@ -11,8 +11,8 @@ Homepage: http://kile.sourceforge.net
 Package: kile-trinity
 Architecture: any
 Section: tex
-Replaces: kile-trinity (<< 4:14.0.0)
-Breaks: kile-trinity (<< 4:14.0.0)
+Replaces: kile-kde3 (<< 4:14.0.0), kile-trinity (<< 4:14.0.0)
+Breaks: kile-kde3 (<< 4:14.0.0), kile-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, konsole-trinity, texlive-latex-base
 Recommends: kdvi-trinity, dvipng, kghostview-trinity, kpdf-trinity
 Suggests: gbib, latex2html, pybliographer, xfig, kile-trinity-i18n, gv
@@ -33,8 +33,8 @@ Description: KDE Integrated LaTeX Environment [Trinity]
 Package: kile-trinity-i18n-ar
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-ar (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-ar (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-ar (<< 4:14.0.0), kile-trinity-i18n-ar (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-ar (<< 4:14.0.0), kile-trinity-i18n-ar (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-ar
 Provides: kile-trinity-i18n
@@ -44,8 +44,8 @@ Description: Arabic (ar) translations for Kile [Trinity]
 Package: kile-trinity-i18n-bg
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-bg (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-bg (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-bg (<< 4:14.0.0), kile-trinity-i18n-bg (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-bg (<< 4:14.0.0), kile-trinity-i18n-bg (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-bg
 Provides: kile-trinity-i18n
@@ -55,8 +55,8 @@ Description: Bulgarian (bg) translations for Kile [Trinity]
 Package: kile-trinity-i18n-br
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-br (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-br (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-br (<< 4:14.0.0), kile-trinity-i18n-br (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-br (<< 4:14.0.0), kile-trinity-i18n-br (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-br
 Provides: kile-trinity-i18n
@@ -66,8 +66,8 @@ Description: Brazilian (br) translations for Kile [Trinity]
 Package: kile-trinity-i18n-ca
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-ca (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-ca (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-ca (<< 4:14.0.0), kile-trinity-i18n-ca (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-ca (<< 4:14.0.0), kile-trinity-i18n-ca (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-ca
 Provides: kile-trinity-i18n
@@ -77,8 +77,8 @@ Description: Catalan (ca) translations for Kile [Trinity]
 Package: kile-trinity-i18n-cs
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-cs (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-cs (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-cs (<< 4:14.0.0), kile-trinity-i18n-cs (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-cs (<< 4:14.0.0), kile-trinity-i18n-cs (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-cs
 Provides: kile-trinity-i18n
@@ -88,8 +88,8 @@ Description: Czech (cs) translations for Kile [Trinity]
 Package: kile-trinity-i18n-cy
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-cy (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-cy (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-cy (<< 4:14.0.0), kile-trinity-i18n-cy (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-cy (<< 4:14.0.0), kile-trinity-i18n-cy (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-cy
 Provides: kile-trinity-i18n
@@ -99,8 +99,8 @@ Description: Welsh (cy) translations for Kile [Trinity]
 Package: kile-trinity-i18n-da
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-da (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-da (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-da (<< 4:14.0.0), kile-trinity-i18n-da (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-da (<< 4:14.0.0), kile-trinity-i18n-da (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-da
 Provides: kile-trinity-i18n
@@ -110,8 +110,8 @@ Description: Danish (da) translations for Kile [Trinity]
 Package: kile-trinity-i18n-de
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-de (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-de (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-de (<< 4:14.0.0), kile-trinity-i18n-de (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-de (<< 4:14.0.0), kile-trinity-i18n-de (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-de
 Provides: kile-trinity-i18n
@@ -121,8 +121,8 @@ Description: German (de) translations for Kile [Trinity]
 Package: kile-trinity-i18n-el
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-el (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-el (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-el (<< 4:14.0.0), kile-trinity-i18n-el (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-el (<< 4:14.0.0), kile-trinity-i18n-el (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-el
 Provides: kile-trinity-i18n
@@ -132,8 +132,8 @@ Description: Greek (el) translations for Kile [Trinity]
 Package: kile-trinity-i18n-engb
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-engb (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-engb (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-engb (<< 4:14.0.0), kile-trinity-i18n-engb (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-engb (<< 4:14.0.0), kile-trinity-i18n-engb (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-engb
 Provides: kile-trinity-i18n
@@ -143,8 +143,8 @@ Description: British English (en_GB) translations for Kile [Trinity]
 Package: kile-trinity-i18n-es
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-es (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-es (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-es (<< 4:14.0.0), kile-trinity-i18n-es (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-es (<< 4:14.0.0), kile-trinity-i18n-es (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-es
 Provides: kile-trinity-i18n
@@ -154,8 +154,8 @@ Description: Spanish (es) translations for Kile [Trinity]
 Package: kile-trinity-i18n-et
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-et (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-et (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-et (<< 4:14.0.0), kile-trinity-i18n-et (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-et (<< 4:14.0.0), kile-trinity-i18n-et (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-et
 Provides: kile-trinity-i18n
@@ -165,8 +165,8 @@ Description: Estonian (et) translations for Kile [Trinity]
 Package: kile-trinity-i18n-eu
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-eu (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-eu (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-eu (<< 4:14.0.0), kile-trinity-i18n-eu (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-eu (<< 4:14.0.0), kile-trinity-i18n-eu (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-eu
 Provides: kile-trinity-i18n
@@ -176,8 +176,8 @@ Description: Basque (eu) translations for Kile [Trinity]
 Package: kile-trinity-i18n-fi
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-fi (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-fi (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-fi (<< 4:14.0.0), kile-trinity-i18n-fi (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-fi (<< 4:14.0.0), kile-trinity-i18n-fi (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-fi
 Provides: kile-trinity-i18n
@@ -187,8 +187,8 @@ Description: Finnish (fi) translations for Kile [Trinity]
 Package: kile-trinity-i18n-fr
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-fr (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-fr (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-fr (<< 4:14.0.0), kile-trinity-i18n-fr (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-fr (<< 4:14.0.0), kile-trinity-i18n-fr (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-fr
 Provides: kile-trinity-i18n
@@ -198,8 +198,8 @@ Description: French (fr) translations for Kile [Trinity]
 Package: kile-trinity-i18n-ga
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-ga (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-ga (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-ga (<< 4:14.0.0), kile-trinity-i18n-ga (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-ga (<< 4:14.0.0), kile-trinity-i18n-ga (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-ga
 Provides: kile-trinity-i18n
@@ -209,8 +209,8 @@ Description: Irish Gaelic (ga) translations for Kile [Trinity]
 Package: kile-trinity-i18n-gl
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-gl (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-gl (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-gl (<< 4:14.0.0), kile-trinity-i18n-gl (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-gl (<< 4:14.0.0), kile-trinity-i18n-gl (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-gl
 Provides: kile-trinity-i18n
@@ -220,8 +220,8 @@ Description: Galician (gl) translations for Kile [Trinity]
 Package: kile-trinity-i18n-hi
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-hi (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-hi (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-hi (<< 4:14.0.0), kile-trinity-i18n-hi (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-hi (<< 4:14.0.0), kile-trinity-i18n-hi (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-hi
 Provides: kile-trinity-i18n
@@ -231,8 +231,8 @@ Description: Hindi (hi) translations for Kile [Trinity]
 Package: kile-trinity-i18n-hu
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-hu (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-hu (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-hu (<< 4:14.0.0), kile-trinity-i18n-hu (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-hu (<< 4:14.0.0), kile-trinity-i18n-hu (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-hu
 Provides: kile-trinity-i18n
@@ -242,8 +242,8 @@ Description: Hungarian (hu) translations for Kile [Trinity]
 Package: kile-trinity-i18n-is
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-is (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-is (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-is (<< 4:14.0.0), kile-trinity-i18n-is (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-is (<< 4:14.0.0), kile-trinity-i18n-is (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-is
 Provides: kile-trinity-i18n
@@ -253,8 +253,8 @@ Description: Icelandic (is) translations for Kile [Trinity]
 Package: kile-trinity-i18n-it
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-it (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-it (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-it (<< 4:14.0.0), kile-trinity-i18n-it (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-it (<< 4:14.0.0), kile-trinity-i18n-it (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-it
 Provides: kile-trinity-i18n
@@ -264,8 +264,8 @@ Description: Italian (it) translations for Kile [Trinity]
 Package: kile-trinity-i18n-ja
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-ja (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-ja (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-ja (<< 4:14.0.0), kile-trinity-i18n-ja (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-ja (<< 4:14.0.0), kile-trinity-i18n-ja (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-ja
 Provides: kile-trinity-i18n
@@ -275,8 +275,8 @@ Description: Japanese (ja) translations for Kile [Trinity]
 Package: kile-trinity-i18n-lt
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-lt (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-lt (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-lt (<< 4:14.0.0), kile-trinity-i18n-lt (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-lt (<< 4:14.0.0), kile-trinity-i18n-lt (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-lt
 Provides: kile-trinity-i18n
@@ -286,8 +286,8 @@ Description: Lithuanian (lt) translations for Kile [Trinity]
 Package: kile-trinity-i18n-ms
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-ms (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-ms (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-ms (<< 4:14.0.0), kile-trinity-i18n-ms (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-ms (<< 4:14.0.0), kile-trinity-i18n-ms (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-ms
 Provides: kile-trinity-i18n
@@ -297,8 +297,8 @@ Description: Malay (ms) translations for Kile [Trinity]
 Package: kile-trinity-i18n-mt
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-mt (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-mt (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-mt (<< 4:14.0.0), kile-trinity-i18n-mt (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-mt (<< 4:14.0.0), kile-trinity-i18n-mt (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Provides: kile-trinity-i18n
 Description: Maltese (mt) translations for Kile [Trinity]
@@ -307,8 +307,8 @@ Description: Maltese (mt) translations for Kile [Trinity]
 Package: kile-trinity-i18n-nb
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-nb (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-nb (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-nb (<< 4:14.0.0), kile-trinity-i18n-nb (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-nb (<< 4:14.0.0), kile-trinity-i18n-nb (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-nb
 Provides: kile-trinity-i18n
@@ -318,8 +318,8 @@ Description: Norwegian Bookmal (nb) translations for Kile [Trinity]
 Package: kile-trinity-i18n-nds
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-nds (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-nds (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-nds (<< 4:14.0.0), kile-trinity-i18n-nds (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-nds (<< 4:14.0.0), kile-trinity-i18n-nds (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-nds
 Provides: kile-trinity-i18n
@@ -329,8 +329,8 @@ Description: Low Saxon (nds) translations for Kile [Trinity]
 Package: kile-trinity-i18n-nl
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-nl (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-nl (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-nl (<< 4:14.0.0), kile-trinity-i18n-nl (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-nl (<< 4:14.0.0), kile-trinity-i18n-nl (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-nl
 Provides: kile-trinity-i18n
@@ -340,8 +340,8 @@ Description: Dutch (nl) translations for Kile [Trinity]
 Package: kile-trinity-i18n-nn
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-nn (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-nn (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-nn (<< 4:14.0.0), kile-trinity-i18n-nn (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-nn (<< 4:14.0.0), kile-trinity-i18n-nn (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-nn
 Provides: kile-trinity-i18n
@@ -351,8 +351,8 @@ Description: Norwegian Nynorsk (nn) translations for Kile [Trinity]
 Package: kile-trinity-i18n-pa
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-pa (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-pa (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-pa (<< 4:14.0.0), kile-trinity-i18n-pa (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-pa (<< 4:14.0.0), kile-trinity-i18n-pa (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-pa
 Provides: kile-trinity-i18n
@@ -362,8 +362,8 @@ Description: Punjabi (pa) translations for Kile [Trinity]
 Package: kile-trinity-i18n-pl
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-pl (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-pl (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-pl (<< 4:14.0.0), kile-trinity-i18n-pl (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-pl (<< 4:14.0.0), kile-trinity-i18n-pl (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-pl
 Provides: kile-trinity-i18n
@@ -373,8 +373,8 @@ Description: Polish (pl) translations for Kile [Trinity]
 Package: kile-trinity-i18n-pt
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-pt (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-pt (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-pt (<< 4:14.0.0), kile-trinity-i18n-pt (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-pt (<< 4:14.0.0), kile-trinity-i18n-pt (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-pt
 Provides: kile-trinity-i18n
@@ -384,8 +384,8 @@ Description: Portuguese (pt) translations for Kile [Trinity]
 Package: kile-trinity-i18n-ptbr
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-ptbr (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-ptbr (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-ptbr (<< 4:14.0.0), kile-trinity-i18n-ptbr (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-ptbr (<< 4:14.0.0), kile-trinity-i18n-ptbr (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-ptbr
 Provides: kile-trinity-i18n
@@ -395,8 +395,8 @@ Description: Brazilian Portuguese (pt_BR) translations for Kile [Trinity]
 Package: kile-trinity-i18n-ro
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-ro (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-ro (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-ro (<< 4:14.0.0), kile-trinity-i18n-ro (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-ro (<< 4:14.0.0), kile-trinity-i18n-ro (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-ro
 Provides: kile-trinity-i18n
@@ -406,8 +406,8 @@ Description: Romanian (ro) translations for Kile [Trinity]
 Package: kile-trinity-i18n-ru
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-ru (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-ru (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-ru (<< 4:14.0.0), kile-trinity-i18n-ru (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-ru (<< 4:14.0.0), kile-trinity-i18n-ru (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-ru
 Provides: kile-trinity-i18n
@@ -417,8 +417,8 @@ Description: Russian (ru) translations for Kile [Trinity]
 Package: kile-trinity-i18n-rw
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-rw (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-rw (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-rw (<< 4:14.0.0), kile-trinity-i18n-rw (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-rw (<< 4:14.0.0), kile-trinity-i18n-rw (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-rw
 Provides: kile-trinity-i18n
@@ -428,8 +428,8 @@ Description: Kinyarwanda (rw) translations for Kile [Trinity]
 Package: kile-trinity-i18n-sk
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-sk (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-sk (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-sk (<< 4:14.0.0), kile-trinity-i18n-sk (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-sk (<< 4:14.0.0), kile-trinity-i18n-sk (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-sk
 Provides: kile-trinity-i18n
@@ -439,8 +439,8 @@ Description: Slovak (sk) translations for Kile [Trinity]
 Package: kile-trinity-i18n-sr
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-sr (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-sr (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-sr (<< 4:14.0.0), kile-trinity-i18n-sr (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-sr (<< 4:14.0.0), kile-trinity-i18n-sr (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-sr
 Provides: kile-trinity-i18n
@@ -450,8 +450,8 @@ Description: Serbian (sr) translations for Kile [Trinity]
 Package: kile-trinity-i18n-srlatin
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-srlatin (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-srlatin (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-srlatin (<< 4:14.0.0), kile-trinity-i18n-srlatin (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-srlatin (<< 4:14.0.0), kile-trinity-i18n-srlatin (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-srlatin
 Provides: kile-trinity-i18n
@@ -461,8 +461,8 @@ Description: Latin Serbian (sr@Latn) translations for Kile [Trinity]
 Package: kile-trinity-i18n-sv
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-sv (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-sv (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-sv (<< 4:14.0.0), kile-trinity-i18n-sv (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-sv (<< 4:14.0.0), kile-trinity-i18n-sv (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-sv
 Provides: kile-trinity-i18n
@@ -472,8 +472,8 @@ Description: Swedish (sv) translations for Kile [Trinity]
 Package: kile-trinity-i18n-ta
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-ta (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-ta (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-ta (<< 4:14.0.0), kile-trinity-i18n-ta (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-ta (<< 4:14.0.0), kile-trinity-i18n-ta (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-ta
 Provides: kile-trinity-i18n
@@ -483,8 +483,8 @@ Description: Tamil (ta) translations for Kile [Trinity]
 Package: kile-trinity-i18n-th
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-th (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-th (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-th (<< 4:14.0.0), kile-trinity-i18n-th (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-th (<< 4:14.0.0), kile-trinity-i18n-th (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-th
 Provides: kile-trinity-i18n
@@ -494,8 +494,8 @@ Description: Thai (th) translations for Kile [Trinity]
 Package: kile-trinity-i18n-tr
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-tr (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-tr (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-tr (<< 4:14.0.0), kile-trinity-i18n-tr (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-tr (<< 4:14.0.0), kile-trinity-i18n-tr (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-tr
 Provides: kile-trinity-i18n
@@ -505,8 +505,8 @@ Description: Turkish (tr) translations for Kile [Trinity]
 Package: kile-trinity-i18n-uk
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-uk (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-uk (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-uk (<< 4:14.0.0), kile-trinity-i18n-uk (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-uk (<< 4:14.0.0), kile-trinity-i18n-uk (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-uk
 Provides: kile-trinity-i18n
@@ -516,8 +516,8 @@ Description: Ukrainian (uk) translations for Kile [Trinity]
 Package: kile-trinity-i18n-zhcn
 Architecture: all
 Section: tex
-Replaces: kile-trinity-i18n-zhcn (<< 4:14.0.0)
-Breaks: kile-trinity-i18n-zhcn (<< 4:14.0.0)
+Replaces: kile-kde3-i18n-zhcn (<< 4:14.0.0), kile-trinity-i18n-zhcn (<< 4:14.0.0)
+Breaks: kile-kde3-i18n-zhcn (<< 4:14.0.0), kile-trinity-i18n-zhcn (<< 4:14.0.0)
 Depends: kile-trinity (>= ${source:Version})
 Recommends: kde-trinity-i18n-zhcn
 Provides: kile-trinity-i18n
diff --git a/ubuntu/maverick/applications/kima/debian/control b/ubuntu/maverick/applications/kima/debian/control
index 53854bde3..272dedc51 100644
--- a/ubuntu/maverick/applications/kima/debian/control
+++ b/ubuntu/maverick/applications/kima/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: kima-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kima-trinity (<< 4:14.0.0)
-Breaks: kima-trinity (<< 4:14.0.0)
+Replaces: kima-kde3 (<< 4:14.0.0), kima-trinity (<< 4:14.0.0)
+Breaks: kima-kde3 (<< 4:14.0.0), kima-trinity (<< 4:14.0.0)
 Description: kicker monitoring applet [Trinity]
  This applet monitors various temperature,
  frequency and fan sources in your kicker
diff --git a/ubuntu/maverick/applications/kmplayer/debian/control b/ubuntu/maverick/applications/kmplayer/debian/control
index da67b2312..236657c03 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/control
+++ b/ubuntu/maverick/applications/kmplayer/debian/control
@@ -14,8 +14,8 @@ Homepage: http://kmplayer.kde.org
 Package: kmplayer-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine2-x | libxine1-x (<< 1.1.20) | libxine1 (<< 1.1.8-2)
-Replaces: kmplayer-trinity (<< 4:14.0.0)
-Breaks: kmplayer-trinity (<< 4:14.0.0)
+Replaces: kmplayer-kde3 (<< 4:14.0.0), kmplayer-trinity (<< 4:14.0.0)
+Breaks: kmplayer-kde3 (<< 4:14.0.0), kmplayer-trinity (<< 4:14.0.0)
 Recommends: kmplayer-plugin-trinity (= ${binary:Version})
 Suggests: ffmpeg, vdr, xawtv, mplayer
 Description: media player for Trinity
@@ -37,8 +37,8 @@ Description: media player for Trinity
 Package: kmplayer-base-trinity
 Architecture: any
 Section: tde
-Replaces: kmplayer-base-trinity (<< 4:14.0.0)
-Breaks: kmplayer-base-trinity (<< 4:14.0.0)
+Replaces: kmplayer-base-kde3 (<< 4:14.0.0), kmplayer-base-trinity (<< 4:14.0.0)
+Breaks: kmplayer-base-kde3 (<< 4:14.0.0), kmplayer-base-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: Base files for KMPlayer [Trinity]
  Core files needed for KMPlayer.
@@ -48,8 +48,8 @@ Description: Base files for KMPlayer [Trinity]
 Package: kmplayer-konq-plugins-trinity
 Architecture: any
 Section: tde
-Replaces: kmplayer-konq-plugins-trinity (<< 4:14.0.0)
-Breaks: kmplayer-konq-plugins-trinity (<< 4:14.0.0)
+Replaces: kmplayer-konq-plugins-kde3 (<< 4:14.0.0), kmplayer-konq-plugins-trinity (<< 4:14.0.0)
+Breaks: kmplayer-konq-plugins-kde3 (<< 4:14.0.0), kmplayer-konq-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), konqueror-trinity
 Description: KMPlayer plugin for TDEHTML/Konqueror [Trinity]
  This plugin enables audio/video playback inside konqueror, using Xine (with
@@ -60,8 +60,8 @@ Description: KMPlayer plugin for TDEHTML/Konqueror [Trinity]
 Package: kmplayer-trinity-doc
 Architecture: all
 Section: tde
-Replaces: kmplayer-trinity-doc (<< 4:14.0.0)
-Breaks: kmplayer-trinity-doc (<< 4:14.0.0)
+Replaces: kmplayer-kde3-doc (<< 4:14.0.0), kmplayer-trinity-doc (<< 4:14.0.0)
+Breaks: kmplayer-kde3-doc (<< 4:14.0.0), kmplayer-trinity-doc (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, kmplayer-trinity
 Description: Handbook for KMPlayer [Trinity]
  Documention for KMPlayer, a basic audio/video viewer application for KDE.
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/control b/ubuntu/maverick/applications/kmyfirewall/debian/control
index 987335ba7..7899cda2f 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/control
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/control
@@ -9,8 +9,8 @@ Homepage: http://kmyfirewall.sourceforge.net/
 Package: kmyfirewall-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kmyfirewall-trinity (<< 4:14.0.0)
-Breaks: kmyfirewall-trinity (<< 4:14.0.0)
+Replaces: kmyfirewall-kde3 (<< 4:14.0.0), kmyfirewall-trinity (<< 4:14.0.0)
+Breaks: kmyfirewall-kde3 (<< 4:14.0.0), kmyfirewall-trinity (<< 4:14.0.0)
 Description: iptables based firewall configuration tool for KDE [Trinity]
  KMyFirewall attempts to make it easier to setup iptables based firewalls on
  Linux systems. It will be the right tool if you like to have a so called
diff --git a/ubuntu/maverick/applications/kmymoney/debian/control b/ubuntu/maverick/applications/kmymoney/debian/control
index 7e5b1a716..8ed210192 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/control
+++ b/ubuntu/maverick/applications/kmymoney/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.4
 Package: kmymoney2-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${shlibs:Misc}, ${misc:Depends}, kmymoney2-common-trinity (>= ${source:Version})
-Replaces: kmymoney2-trinity (<< 4:14.0.0)
-Breaks: kmymoney2-trinity (<< 4:14.0.0)
+Replaces: kmymoney2-kde3 (<< 4:14.0.0), kmymoney2-trinity (<< 4:14.0.0)
+Breaks: kmymoney2-kde3 (<< 4:14.0.0), kmymoney2-trinity (<< 4:14.0.0)
 Recommends: kmymoney2-plugin-aqbanking-trinity
 Description: personal finance manager for TDE
  KMyMoney is the Personal Finance Manager for TDE. It operates similar to
@@ -22,8 +22,8 @@ Description: personal finance manager for TDE
 Package: kmymoney2-common-trinity
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: kmymoney2-common-trinity (<< 4:14.0.0)
-Breaks: kmymoney2-common-trinity (<< 4:14.0.0)
+Replaces: kmymoney2-common-kde3 (<< 4:14.0.0), kmymoney2-common-trinity (<< 4:14.0.0)
+Breaks: kmymoney2-common-kde3 (<< 4:14.0.0), kmymoney2-common-trinity (<< 4:14.0.0)
 Recommends: kmymoney2-trinity (>= ${source:Version})
 Description: KMyMoney architecture independent files
  This package contains architecture independent files needed for KMyMoney to
@@ -33,8 +33,8 @@ Description: KMyMoney architecture independent files
 Package: kmymoney2-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: kmymoney2-trinity-dev (<< 4:14.0.0)
-Breaks: kmymoney2-trinity-dev (<< 4:14.0.0)
+Replaces: kmymoney2-kde3-dev (<< 4:14.0.0), kmymoney2-trinity-dev (<< 4:14.0.0)
+Breaks: kmymoney2-kde3-dev (<< 4:14.0.0), kmymoney2-trinity-dev (<< 4:14.0.0)
 Depends: ${misc:Depends}, kmymoney2-trinity (= ${binary:Version})
 Description: KMyMoney development files
  This package contains development files needed for KMyMoney plugins.
diff --git a/ubuntu/maverick/applications/knemo/debian/control b/ubuntu/maverick/applications/knemo/debian/control
index a09dc18a9..135848e71 100644
--- a/ubuntu/maverick/applications/knemo/debian/control
+++ b/ubuntu/maverick/applications/knemo/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: knemo-trinity
 Architecture: any
 Depends: kicker-trinity, net-tools, ${shlibs:Depends}
-Replaces: knemo-trinity (<< 4:14.0.0)
-Breaks: knemo-trinity (<< 4:14.0.0)
+Replaces: knemo-kde3 (<< 4:14.0.0), knemo-trinity (<< 4:14.0.0)
+Breaks: knemo-kde3 (<< 4:14.0.0), knemo-trinity (<< 4:14.0.0)
 Recommends: kcontrol-trinity, wireless-tools
 Description: network interfaces monitor for the Trinity systray
  KNemo displays an icon in the systray for every network interface.
diff --git a/ubuntu/maverick/applications/knetload/debian/control b/ubuntu/maverick/applications/knetload/debian/control
index 10a958059..4c72da944 100644
--- a/ubuntu/maverick/applications/knetload/debian/control
+++ b/ubuntu/maverick/applications/knetload/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: knetload-trinity
 Architecture: any
 Section: tde
-Replaces: knetload-trinity (<< 4:14.0.0)
-Breaks: knetload-trinity (<< 4:14.0.0)
+Replaces: knetload-kde3 (<< 4:14.0.0), knetload-trinity (<< 4:14.0.0)
+Breaks: knetload-kde3 (<< 4:14.0.0), knetload-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Conflicts: knetload
 Suggests: kcpuload-trinity
diff --git a/ubuntu/maverick/applications/knetstats/debian/control b/ubuntu/maverick/applications/knetstats/debian/control
index 5aa11bdca..4101da9a8 100644
--- a/ubuntu/maverick/applications/knetstats/debian/control
+++ b/ubuntu/maverick/applications/knetstats/debian/control
@@ -9,8 +9,8 @@ Homepage: http://knetstats.sourceforge.net/
 Package: knetstats-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: knetstats-trinity (<< 4:14.0.0)
-Breaks: knetstats-trinity (<< 4:14.0.0)
+Replaces: knetstats-kde3 (<< 4:14.0.0), knetstats-trinity (<< 4:14.0.0)
+Breaks: knetstats-kde3 (<< 4:14.0.0), knetstats-trinity (<< 4:14.0.0)
 Description: network interfaces monitor for the Trinity systray
  A simple KDE network monitor that show rx/tx LEDs of any
  network interface on a system tray icon
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control
index 268d37649..9837b0574 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control
@@ -25,8 +25,8 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
 Package: network-manager-tde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Replaces: network-manager-kde-trinity (<< 4:14.0.0)
-Breaks: network-manager-kde-trinity (<< 4:14.0.0)
+Replaces: network-manager-kde-kde3 (<< 4:14.0.0),  network-manager-kde-trinity (<< 4:14.0.0)
+Breaks: network-manager-kde-kde3 (<< 4:14.0.0), network-manager-kde-trinity (<< 4:14.0.0)
 Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control
index 2f3d45694..32a401cd2 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control
@@ -26,8 +26,8 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
 Package: network-manager-kde-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
-Replaces: network-manager-kde-trinity (<< 4:14.0.0)
-Breaks: network-manager-kde-trinity (<< 4:14.0.0)
+Replaces: network-manager-kde-kde3 (<< 4:14.0.0), network-manager-kde-trinity (<< 4:14.0.0)
+Breaks: network-manager-kde-kde3 (<< 4:14.0.0), network-manager-kde-trinity (<< 4:14.0.0)
 Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/control b/ubuntu/maverick/applications/knetworkmanager9/debian/control
index 6bc8c18a8..f9f6fbf25 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager9/debian/control
@@ -16,8 +16,8 @@ Homepage: http://www.trinitydesktop.org/
 Package: network-manager-tde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: network-manager-kde-trinity (<< 4:14.0.0)
-Breaks: network-manager-kde-trinity (<< 4:14.0.0)
+Replaces: network-manager-kde-kde3 (<< 4:14.0.0), network-manager-kde-trinity (<< 4:14.0.0)
+Breaks: network-manager-kde-kde3 (<< 4:14.0.0), network-manager-kde-trinity (<< 4:14.0.0)
 Recommends: tdewalletmanager-trinity
 Provides: tdenetworkmanager-trinity
 Description: TDE systray applet for controlling networking [Trinity]
diff --git a/ubuntu/maverick/applications/knights/debian/control b/ubuntu/maverick/applications/knights/debian/control
index 611c600ce..35a36871e 100644
--- a/ubuntu/maverick/applications/knights/debian/control
+++ b/ubuntu/maverick/applications/knights/debian/control
@@ -11,8 +11,8 @@ Homepage: http://knights.sourceforge.net/
 Package: knights-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, tdebase-tdeio-plugins-trinity
-Replaces: knights-trinity (<< 4:14.0.0)
-Breaks: knights-trinity (<< 4:14.0.0)
+Replaces: knights-kde3 (<< 4:14.0.0), knights-trinity (<< 4:14.0.0)
+Breaks: knights-kde3 (<< 4:14.0.0), knights-trinity (<< 4:14.0.0)
 Suggests: gnuchess | crafty | sjeng, knights-themepack-trinity
 Description: A chess interface for the K Desktop Environment [Trinity]
  Knights aims to be the ultimate chess resource on your computer. 
diff --git a/ubuntu/maverick/applications/knowit/debian/control b/ubuntu/maverick/applications/knowit/debian/control
index 484d94d2a..b6df5e1e2 100644
--- a/ubuntu/maverick/applications/knowit/debian/control
+++ b/ubuntu/maverick/applications/knowit/debian/control
@@ -10,8 +10,8 @@ Homepage: http://knowit.sourceforge.net/
 Package: knowit-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: knowit-trinity (<< 4:14.0.0)
-Breaks: knowit-trinity (<< 4:14.0.0)
+Replaces: knowit-kde3 (<< 4:14.0.0), knowit-trinity (<< 4:14.0.0)
+Breaks: knowit-kde3 (<< 4:14.0.0), knowit-trinity (<< 4:14.0.0)
 Description: Tool for managing notes [Trinity]
  KnowIt is a tool for managing notes which are organized in
  tree-like hierarchy. It is similar to TuxCards,
diff --git a/ubuntu/maverick/applications/knutclient/debian/control b/ubuntu/maverick/applications/knutclient/debian/control
index cf276ef86..d136241bf 100644
--- a/ubuntu/maverick/applications/knutclient/debian/control
+++ b/ubuntu/maverick/applications/knutclient/debian/control
@@ -10,8 +10,8 @@ Homepage: http://www.knut.noveradsl.cz/knutclient/
 Package: knutclient-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: knutclient-trinity (<< 4:14.0.0)
-Breaks: knutclient-trinity (<< 4:14.0.0)
+Replaces: knutclient-kde3 (<< 4:14.0.0), knutclient-trinity (<< 4:14.0.0)
+Breaks: knutclient-kde3 (<< 4:14.0.0), knutclient-trinity (<< 4:14.0.0)
 Description: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
  KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
  http://www.networkupstools.org/) framework on Linux and other systems. This
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control
index 0f3550afe..0e052a29a 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/maverick/applications/koffice/debian/control
@@ -12,8 +12,8 @@ Homepage: http://www.koffice.org
 Package: koffice-trinity
 Architecture: all
 Section: tde
-Replaces: koffice-trinity (<< 4:14.0.0)
-Breaks: koffice-trinity (<< 4:14.0.0)
+Replaces: koffice-kde3 (<< 4:14.0.0), koffice-trinity (<< 4:14.0.0)
+Breaks: koffice-kde3 (<< 4:14.0.0), koffice-trinity (<< 4:14.0.0)
 Depends: karbon-trinity (>= ${source:Version}), kchart-trinity (>= ${source:Version}), kexi-trinity (>= ${source:Version}), kformula-trinity (>= ${source:Version}), kivio-trinity (>= ${source:Version}), koshell-trinity (>= ${source:Version}), kplato-trinity (>= ${source:Version}), kpresenter-trinity (>= ${source:Version}), chalk-trinity (>= ${source:Version}), kspread-trinity (>= ${source:Version}), kugar-trinity (>= ${source:Version}), kword-trinity (>= ${source:Version}), kthesaurus-trinity (>= ${source:Version})
 Suggests: koffice-i18n-trinity, koffice-trinity-dev (>= ${source:Version}), koffice-trinity-doc (>= ${source:Version}), koffice-trinity-doc-html (= ${source:Version})
 Description: KDE Office Suite [Trinity]
@@ -26,8 +26,8 @@ Description: KDE Office Suite [Trinity]
 Package: koffice-trinity-doc
 Section: doc
 Architecture: all
-Replaces: koffice-trinity-doc (<< 4:14.0.0)
-Breaks: koffice-trinity-doc (<< 4:14.0.0)
+Replaces: koffice-kde3-doc (<< 4:14.0.0), koffice-trinity-doc (<< 4:14.0.0)
+Breaks: koffice-kde3-doc (<< 4:14.0.0), koffice-trinity-doc (<< 4:14.0.0)
 Description: developer documentation for the KDE Office Suite [Trinity]
  This package contains documentation for the KDE Office Suite, of
  use more for developers creating applications than regular users.
@@ -37,8 +37,8 @@ Description: developer documentation for the KDE Office Suite [Trinity]
 Package: koffice-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: koffice-trinity-doc-html (<< 4:14.0.0)
-Breaks: koffice-trinity-doc-html (<< 4:14.0.0)
+Replaces: koffice-kde3-doc-html (<< 4:14.0.0), koffice-trinity-doc-html (<< 4:14.0.0)
+Breaks: koffice-kde3-doc-html (<< 4:14.0.0), koffice-trinity-doc-html (<< 4:14.0.0)
 Suggests: konqueror-trinity | www-browser, koffice-trinity
 Description: KDE Office Suite documentation in HTML format [Trinity]
  KOffice is an integrated office suite for KDE, the K Desktop
@@ -59,8 +59,8 @@ Description: KDE Office Suite documentation in HTML format [Trinity]
 Package: karbon-trinity
 Architecture: any
 Section: graphics
-Replaces: karbon-trinity (<< 4:14.0.0)
-Breaks: karbon-trinity (<< 4:14.0.0)
+Replaces: karbon-kde3 (<< 4:14.0.0), karbon-trinity (<< 4:14.0.0)
+Breaks: karbon-kde3 (<< 4:14.0.0), karbon-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
 Description: a vector graphics application for the KDE Office Suite
  Karbon is a vector graphics application.
@@ -70,8 +70,8 @@ Description: a vector graphics application for the KDE Office Suite
 Package: kchart-trinity
 Architecture: any
 Section: tde
-Replaces: kchart-trinity (<< 4:14.0.0)
-Breaks: kchart-trinity (<< 4:14.0.0)
+Replaces: kchart-kde3 (<< 4:14.0.0), kchart-trinity (<< 4:14.0.0)
+Breaks: kchart-kde3 (<< 4:14.0.0), kchart-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: a chart drawing program for the KDE Office Suite [Trinity]
@@ -83,8 +83,8 @@ Description: a chart drawing program for the KDE Office Suite [Trinity]
 Package: kexi-trinity
 Architecture: any
 Section: tde
-Replaces: kexi-trinity (<< 4:14.0.0)
-Breaks: kexi-trinity (<< 4:14.0.0)
+Replaces: kexi-kde3 (<< 4:14.0.0), kexi-trinity (<< 4:14.0.0)
+Breaks: kexi-kde3 (<< 4:14.0.0), kexi-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
 Suggests: kexi-mdb-plugin-trinity
 Description: integrated database environment for the KDE Office Suite [Trinity]
@@ -105,8 +105,8 @@ Description: integrated database environment for the KDE Office Suite [Trinity]
 Package: kformula-trinity
 Architecture: any
 Section: tde
-Replaces: kformula-trinity (<< 4:14.0.0)
-Breaks: kformula-trinity (<< 4:14.0.0)
+Replaces: kformula-kde3 (<< 4:14.0.0), kformula-trinity (<< 4:14.0.0)
+Breaks: kformula-kde3 (<< 4:14.0.0), kformula-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: a formula editor for the KDE Office Suite [Trinity]
@@ -122,8 +122,8 @@ Description: a formula editor for the KDE Office Suite [Trinity]
 Package: kivio-trinity
 Architecture: any
 Section: graphics
-Replaces: kivio-trinity (<< 4:14.0.0)
-Breaks: kivio-trinity (<< 4:14.0.0)
+Replaces: kivio-kde3 (<< 4:14.0.0), kivio-trinity (<< 4:14.0.0)
+Breaks: kivio-kde3 (<< 4:14.0.0), kivio-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, kivio-data-trinity (>> 1:1.4.90.2-1), kivio-data-trinity (>> ${KDE-Version3}), kivio-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
 Description: a flowcharting program for the KDE Office Suite [Trinity]
  Kivio is a flowcharting program that offers basic flowcharting abilities,
@@ -135,8 +135,8 @@ Description: a flowcharting program for the KDE Office Suite [Trinity]
 Package: kivio-data-trinity
 Architecture: all
 Section: graphics
-Replaces: kivio-data-trinity (<< 4:14.0.0)
-Breaks: kivio-data-trinity (<< 4:14.0.0)
+Replaces: kivio-data-kde3 (<< 4:14.0.0), kivio-data-trinity (<< 4:14.0.0)
+Breaks: kivio-data-kde3 (<< 4:14.0.0), kivio-data-trinity (<< 4:14.0.0)
 Description: data files for Kivio flowcharting program [Trinity]
  This package contains architecture-independent data files for Kivio,
  the flowcharting program shipped with the KDE Office Suite.
@@ -148,8 +148,8 @@ Description: data files for Kivio flowcharting program [Trinity]
 Package: koshell-trinity
 Architecture: any
 Section: tde
-Replaces: koshell-trinity (<< 4:14.0.0)
-Breaks: koshell-trinity (<< 4:14.0.0)
+Replaces: koshell-kde3 (<< 4:14.0.0), koshell-trinity (<< 4:14.0.0)
+Breaks: koshell-kde3 (<< 4:14.0.0), koshell-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
 Recommends: koffice-trinity, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: the KDE Office Suite workspace [Trinity]
@@ -161,8 +161,8 @@ Description: the KDE Office Suite workspace [Trinity]
 Package: kplato-trinity
 Architecture: any
 Section: tde
-Replaces: kplato-trinity (<< 4:14.0.0)
-Breaks: kplato-trinity (<< 4:14.0.0)
+Replaces: kplato-kde3 (<< 4:14.0.0), kplato-trinity (<< 4:14.0.0)
+Breaks: kplato-kde3 (<< 4:14.0.0), kplato-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: an integrated project management and planning tool [Trinity]
@@ -175,8 +175,8 @@ Description: an integrated project management and planning tool [Trinity]
 Package: kpresenter-trinity
 Architecture: any
 Section: tde
-Replaces: kpresenter-trinity (<< 4:14.0.0)
-Breaks: kpresenter-trinity (<< 4:14.0.0)
+Replaces: kpresenter-kde3 (<< 4:14.0.0), kpresenter-trinity (<< 4:14.0.0)
+Breaks: kpresenter-kde3 (<< 4:14.0.0), kpresenter-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data-trinity (>> ${KDE-Version3}), kpresenter-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: a presentation program for the KDE Office Suite [Trinity]
@@ -189,8 +189,8 @@ Description: a presentation program for the KDE Office Suite [Trinity]
 Package: kpresenter-data-trinity
 Architecture: all
 Section: tde
-Replaces: kpresenter-data-trinity (<< 4:14.0.0)
-Breaks: kpresenter-data-trinity (<< 4:14.0.0)
+Replaces: kpresenter-data-kde3 (<< 4:14.0.0), kpresenter-data-trinity (<< 4:14.0.0)
+Breaks: kpresenter-data-kde3 (<< 4:14.0.0), kpresenter-data-trinity (<< 4:14.0.0)
 Description: data files for KPresenter presentation program [Trinity]
  This package contains architecture-independent data files for KPresenter,
  the presentation program shipped with the KDE Office Suite.
@@ -202,8 +202,8 @@ Description: data files for KPresenter presentation program [Trinity]
 Package: chalk-trinity
 Architecture: any
 Section: tde
-Replaces: chalk-trinity (<< 4:14.0.0)
-Breaks: chalk-trinity (<< 4:14.0.0)
+Replaces: krita-kde3 (<< 4:14.0.0), chalk-trinity (<< 4:14.0.0)
+Breaks: krita-kde3 (<< 4:14.0.0), chalk-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, chalk-data-trinity (>> ${KDE-Version3}), chalk-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
 Recommends: dcraw, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: a pixel-based image manipulation program for the KDE Office Suite [Trinity]
@@ -215,8 +215,8 @@ Description: a pixel-based image manipulation program for the KDE Office Suite [
 Package: chalk-data-trinity
 Architecture: all
 Section: tde
-Replaces: chalk-data-trinity (<< 4:14.0.0)
-Breaks: chalk-data-trinity (<< 4:14.0.0)
+Replaces: krita-data-kde3 (<< 4:14.0.0), chalk-data-trinity (<< 4:14.0.0)
+Breaks: krita-data-kde3 (<< 4:14.0.0), chalk-data-trinity (<< 4:14.0.0)
 Description: data files for Chalk painting program [Trinity]
  This package contains architecture-independent data files for Chalk,
  the painting program shipped with the KDE Office Suite.
@@ -228,8 +228,8 @@ Description: data files for Chalk painting program [Trinity]
 Package: kspread-trinity
 Architecture: any
 Section: tde
-Replaces: kspread-trinity (<< 4:14.0.0)
-Breaks: kspread-trinity (<< 4:14.0.0)
+Replaces: kspread-kde3 (<< 4:14.0.0), kspread-trinity (<< 4:14.0.0)
+Breaks: kspread-kde3 (<< 4:14.0.0), kspread-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: a spreadsheet for the KDE Office Suite [Trinity]
@@ -242,8 +242,8 @@ Description: a spreadsheet for the KDE Office Suite [Trinity]
 Package: kugar-trinity
 Architecture: any
 Section: tde
-Replaces: kugar-trinity (<< 4:14.0.0)
-Breaks: kugar-trinity (<< 4:14.0.0)
+Replaces: kugar-kde3 (<< 4:14.0.0), kugar-trinity (<< 4:14.0.0)
+Breaks: kugar-kde3 (<< 4:14.0.0), kugar-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: a business report maker for the KDE Office Suite [Trinity]
@@ -258,8 +258,8 @@ Description: a business report maker for the KDE Office Suite [Trinity]
 Package: kword-trinity
 Architecture: any
 Section: tde
-Replaces: kword-trinity (<< 4:14.0.0)
-Breaks: kword-trinity (<< 4:14.0.0)
+Replaces: kword-kde3 (<< 4:14.0.0), kword-trinity (<< 4:14.0.0)
+Breaks: kword-kde3 (<< 4:14.0.0), kword-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, kword-data-trinity (>> ${KDE-Version3}), kword-data-trinity (<< ${KDE-Next-Version3}), koffice-libs-trinity (<< ${KDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: a word processor for the KDE Office Suite [Trinity]
@@ -273,8 +273,8 @@ Description: a word processor for the KDE Office Suite [Trinity]
 Package: kword-data-trinity
 Architecture: all
 Section: tde
-Replaces: kword-data-trinity (<< 4:14.0.0)
-Breaks: kword-data-trinity (<< 4:14.0.0)
+Replaces: kword-data-kde3 (<< 4:14.0.0), kword-data-trinity (<< 4:14.0.0)
+Breaks: kword-data-kde3 (<< 4:14.0.0), kword-data-trinity (<< 4:14.0.0)
 Description: data files for KWord word processor [Trinity]
  This package contains architecture-independent data files for KWord,
  the word processor shipped with the KDE Office Suite.
@@ -286,8 +286,8 @@ Description: data files for KWord word processor [Trinity]
 Package: kthesaurus-trinity
 Architecture: any
 Section: tde
-Replaces: kthesaurus-trinity (<< 4:14.0.0)
-Breaks: kthesaurus-trinity (<< 4:14.0.0)
+Replaces: kthesaurus-kde3 (<< 4:14.0.0), kthesaurus-trinity (<< 4:14.0.0)
+Breaks: kthesaurus-kde3 (<< 4:14.0.0), kthesaurus-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${KDE-Next-Version3})
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
 Description: thesaurus for the KDE Office Suite [Trinity]
@@ -300,8 +300,8 @@ Description: thesaurus for the KDE Office Suite [Trinity]
 Package: koffice-libs-trinity
 Architecture: any
 Section: libs
-Replaces: koffice-libs-trinity (<< 4:14.0.0)
-Breaks: koffice-libs-trinity (<< 4:14.0.0)
+Replaces: koffice-libs-kde3 (<< 4:14.0.0), koffice-libs-trinity (<< 4:14.0.0)
+Breaks: koffice-libs-kde3 (<< 4:14.0.0), koffice-libs-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${KDE-Version3}), koffice-data-trinity (<< ${KDE-Next-Version3})
 Recommends: latex-xft-fonts, ruby, python
 Suggests: wordnet, texlive-base
@@ -314,8 +314,8 @@ Description: common libraries and binaries for the KDE Office Suite [Trinity]
 Package: koffice-data-trinity
 Architecture: all
 Section: libs
-Replaces: koffice-data-trinity (<< 4:14.0.0)
-Breaks: koffice-data-trinity (<< 4:14.0.0)
+Replaces: koffice-data-kde3 (<< 4:14.0.0), koffice-data-trinity (<< 4:14.0.0)
+Breaks: koffice-data-kde3 (<< 4:14.0.0), koffice-data-trinity (<< 4:14.0.0)
 Recommends: khelpcenter-trinity | koffice-trinity-doc-html
 Description: common shared data for the KDE Office Suite [Trinity]
  This package provides the architecture-independent data that is shared
@@ -326,8 +326,8 @@ Description: common shared data for the KDE Office Suite [Trinity]
 Package: koffice-trinity-dev
 Architecture: any
 Section: libdevel
-Replaces: koffice-trinity-dev (<< 4:14.0.0)
-Breaks: koffice-trinity-dev (<< 4:14.0.0)
+Replaces: koffice-kde3-dev (<< 4:14.0.0), koffice-trinity-dev (<< 4:14.0.0)
+Breaks: koffice-kde3-dev (<< 4:14.0.0), koffice-trinity-dev (<< 4:14.0.0)
 Depends: koffice-libs-trinity (= ${binary:Version}), karbon-trinity (= ${binary:Version}), kchart-trinity (= ${binary:Version}), kexi-trinity (= ${binary:Version}), kformula-trinity (= ${binary:Version}), kivio-trinity (= ${binary:Version}), koshell-trinity (= ${binary:Version}), kplato-trinity (= ${binary:Version}), kpresenter-trinity (= ${binary:Version}), chalk-trinity (= ${binary:Version}), kspread-trinity (= ${binary:Version}), kthesaurus-trinity (= ${binary:Version}), kugar-trinity (= ${binary:Version}), kword-trinity (= ${binary:Version}), tdelibs4-trinity-dev
 Description: common libraries for KOffice (development files) [Trinity]
  This package provides the development files for the libraries that are
@@ -338,8 +338,8 @@ Description: common libraries for KOffice (development files) [Trinity]
 Package: koffice-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: koffice-trinity-dbg (<< 4:14.0.0)
-Breaks: koffice-trinity-dbg (<< 4:14.0.0)
+Replaces: koffice-kde3-dbg (<< 4:14.0.0), koffice-trinity-dbg (<< 4:14.0.0)
+Breaks: koffice-kde3-dbg (<< 4:14.0.0), koffice-trinity-dbg (<< 4:14.0.0)
 Priority: extra
 Depends: koffice-libs-trinity (= ${binary:Version})
 Description: debugging symbols for koffice [Trinity]
diff --git a/ubuntu/maverick/applications/konversation/debian/control b/ubuntu/maverick/applications/konversation/debian/control
index 0484a4144..9728d2f8e 100644
--- a/ubuntu/maverick/applications/konversation/debian/control
+++ b/ubuntu/maverick/applications/konversation/debian/control
@@ -12,8 +12,8 @@ Homepage: http://konversation.kde.org/
 Package: konversation-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: konversation-trinity (<< 4:14.0.0)
-Breaks: konversation-trinity (<< 4:14.0.0)
+Replaces: konversation-kde3 (<< 4:14.0.0), konversation-trinity (<< 4:14.0.0)
+Breaks: konversation-kde3 (<< 4:14.0.0), konversation-trinity (<< 4:14.0.0)
 Recommends: python, ruby
 Suggests: libsoap-lite-perl
 Description: user friendly Internet Relay Chat (IRC) client for KDE [Trinity]
@@ -37,8 +37,8 @@ Description: user friendly Internet Relay Chat (IRC) client for KDE [Trinity]
 Package: konversation-trinity-dbg
 Architecture: any
 Priority: extra
-Replaces: konversation-trinity-dbg (<< 4:14.0.0)
-Breaks: konversation-trinity-dbg (<< 4:14.0.0)
+Replaces: konversation-kde3-dbg (<< 4:14.0.0), konversation-trinity-dbg (<< 4:14.0.0)
+Breaks: konversation-kde3-dbg (<< 4:14.0.0), konversation-trinity-dbg (<< 4:14.0.0)
 Depends: konversation-trinity (= ${binary:Version})
 Recommends: tdelibs-trinity-dbg
 Description: debugging symbols for konversation
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/control b/ubuntu/maverick/applications/kopete-otr/debian/control
index f2adcccd2..8c90f29df 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/control
+++ b/ubuntu/maverick/applications/kopete-otr/debian/control
@@ -10,8 +10,8 @@ Homepage: http://kopete-otr.follefuder.org/
 Package: kopete-otr-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kopete-otr-trinity (<< 4:14.0.0)
-Breaks: kopete-otr-trinity (<< 4:14.0.0)
+Replaces: kopete-otr-kde3 (<< 4:14.0.0), kopete-otr-trinity (<< 4:14.0.0)
+Breaks: kopete-otr-kde3 (<< 4:14.0.0), kopete-otr-trinity (<< 4:14.0.0)
 Description: Off-The-Record encryption for Kopete [Trinity]
  This plugin enables Off-The-Record encryption for the KDE instant
  messenger Kopete. Using this plugin you can encrypt chatsessions to other
diff --git a/ubuntu/maverick/applications/kpicosim/debian/control b/ubuntu/maverick/applications/kpicosim/debian/control
index 39d2a7204..2a49b804d 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/control
+++ b/ubuntu/maverick/applications/kpicosim/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: kpicosim-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kpicosim-trinity (<< 4:14.0.0)
-Breaks: kpicosim-trinity (<< 4:14.0.0)
+Replaces: kpicosim-kde3 (<< 4:14.0.0), kpicosim-trinity (<< 4:14.0.0)
+Breaks: kpicosim-kde3 (<< 4:14.0.0), kpicosim-trinity (<< 4:14.0.0)
 Description: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
  kpicosim is a development environment for the Xilinx 
  PicoBlaze-3 soft-core processor for the KDE Desktop (Linux).
diff --git a/ubuntu/maverick/applications/kpilot/debian/control b/ubuntu/maverick/applications/kpilot/debian/control
index 2a571092a..f912ead14 100644
--- a/ubuntu/maverick/applications/kpilot/debian/control
+++ b/ubuntu/maverick/applications/kpilot/debian/control
@@ -12,8 +12,8 @@ Standards-Version: 3.8.4
 Package: kpilot-trinity
 Section: utils
 Architecture: any
-Replaces: kpilot-trinity (<< 4:14.0.0)
-Breaks: kpilot-trinity (<< 4:14.0.0)
+Replaces: kpilot-kde3 (<< 4:14.0.0), kpilot-trinity (<< 4:14.0.0)
+Breaks: kpilot-kde3 (<< 4:14.0.0), kpilot-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0
 Suggests: knotes-trinity, korganizer-trinity
 Description: TDE Palm Pilot hot-sync tool
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/control b/ubuntu/maverick/applications/kpowersave.cmake/debian/control
index c154ffa47..7ad0fceb9 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/control
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/control
@@ -10,8 +10,8 @@ Homepage: http://sourceforge.net/projects/powersave/
 Package: kpowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
-Replaces: kpowersave-trinity (<< 4:14.0.0)
-Breaks: kpowersave-trinity (<< 4:14.0.0)
+Replaces: kpowersave-kde3 (<< 4:14.0.0), kpowersave-trinity (<< 4:14.0.0)
+Breaks: kpowersave-kde3 (<< 4:14.0.0), kpowersave-trinity (<< 4:14.0.0)
 Description: HAL based power management applet for Trinity
  KPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
diff --git a/ubuntu/maverick/applications/kpowersave/debian/control b/ubuntu/maverick/applications/kpowersave/debian/control
index fcd411b7b..1838e316e 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/control
+++ b/ubuntu/maverick/applications/kpowersave/debian/control
@@ -11,8 +11,8 @@ Homepage: http://sourceforge.net/projects/powersave/
 Package: kpowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
-Replaces: kpowersave-trinity (<< 4:14.0.0)
-Breaks: kpowersave-trinity (<< 4:14.0.0)
+Replaces: kpowersave-kde3 (<< 4:14.0.0), kpowersave-trinity (<< 4:14.0.0)
+Breaks: kpowersave-kde3 (<< 4:14.0.0), kpowersave-trinity (<< 4:14.0.0)
 Description: HAL based power management applet for Trinity
  KPowersave is a KDE systray applet which allows to control the power 
  management settings and policies of your computer.
diff --git a/ubuntu/maverick/applications/krename/debian/control b/ubuntu/maverick/applications/krename/debian/control
index affe20e3f..f2d724a87 100644
--- a/ubuntu/maverick/applications/krename/debian/control
+++ b/ubuntu/maverick/applications/krename/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: krename-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: krename-trinity (<< 4:14.0.0)
-Breaks: krename-trinity (<< 4:14.0.0)
+Replaces: krename-kde3 (<< 4:14.0.0), krename-trinity (<< 4:14.0.0)
+Breaks: krename-kde3 (<< 4:14.0.0), krename-trinity (<< 4:14.0.0)
 Description: Powerful batch renamer for KDE 3.x [Trinity]
  This package contains a very powerful batch file renamer for Trinity 
  which can rename a list of files based on a set of expressions.
diff --git a/ubuntu/maverick/applications/krusader/debian/control b/ubuntu/maverick/applications/krusader/debian/control
index cf06f9ab8..6b7001dcc 100644
--- a/ubuntu/maverick/applications/krusader/debian/control
+++ b/ubuntu/maverick/applications/krusader/debian/control
@@ -10,8 +10,8 @@ Homepage: http://krusader.sourceforge.net
 Package: krusader-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: krusader-trinity (<< 4:14.0.0)
-Breaks: krusader-trinity (<< 4:14.0.0)
+Replaces: krusader-kde3 (<< 4:14.0.0), krusader-trinity (<< 4:14.0.0)
+Breaks: krusader-kde3 (<< 4:14.0.0), krusader-trinity (<< 4:14.0.0)
 Suggests: md5deep | cfv, kedit-trinity, khexedit-trinity, konsole-trinity, kmail-trinity,
  krename-trinity, kdiff3-trinity | kompare-trinity | xxdiff, ark-trinity, arj, bzip2, cpio, lha,
  unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, tdebase-trinity-bin,
@@ -38,8 +38,8 @@ Description: twin-panel (commander-style) file manager for KDE (and other deskto
 Package: krusader-trinity-dbg
 Section: devel
 Architecture: any
-Replaces: krusader-trinity-dbg (<< 4:14.0.0)
-Breaks: krusader-trinity-dbg (<< 4:14.0.0)
+Replaces: krusader-kde3-dbg (<< 4:14.0.0), krusader-trinity-dbg (<< 4:14.0.0)
+Breaks: krusader-kde3-dbg (<< 4:14.0.0), krusader-trinity-dbg (<< 4:14.0.0)
 Priority: extra
 Depends: krusader-trinity (= ${binary:Version})
 Description: debugging symbols for krusader-trinity
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control
index 1bb2aae06..85ecb5faf 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control
+++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.4
 Package: ksplash-engine-moodin-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: ksplash-engine-moodin-trinity (<< 4:14.0.0)
-Breaks: ksplash-engine-moodin-trinity (<< 4:14.0.0)
+Replaces: ksplash-engine-moodin-kde3 (<< 4:14.0.0), ksplash-engine-moodin-trinity (<< 4:14.0.0)
+Breaks: ksplash-engine-moodin-kde3 (<< 4:14.0.0), ksplash-engine-moodin-trinity (<< 4:14.0.0)
 Description: fading splash screen engine for Trinity
  Heavily customizable engine for various types of themes.
  .
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/control b/ubuntu/maverick/applications/ksquirrel/debian/control
index 2c9b9b633..766a956be 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/control
+++ b/ubuntu/maverick/applications/ksquirrel/debian/control
@@ -16,8 +16,8 @@ Standards-Version: 3.8.4
 Package: ksquirrel-trinity
 Architecture: any
 Depends: libksquirrel0-trinity, ${shlibs:Depends}, ${misc:Depends}
-Replaces: ksquirrel-trinity (<< 4:14.0.0)
-Breaks: ksquirrel-trinity (<< 4:14.0.0)
+Replaces: ksquirrel-kde3 (<< 4:14.0.0), ksquirrel-trinity (<< 4:14.0.0)
+Breaks: ksquirrel-kde3 (<< 4:14.0.0), ksquirrel-trinity (<< 4:14.0.0)
 Description: Powerful Trinity image viewer
  KSquirrel is an image viewer for KDE with disk navigator, file tree,
  multiple directory view, thumbnails, extended thumbnails, dynamic
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/control b/ubuntu/maverick/applications/kstreamripper/debian/control
index 505bc6682..9e8f57b48 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/control
+++ b/ubuntu/maverick/applications/kstreamripper/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: kstreamripper-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, streamripper
-Replaces: kstreamripper-trinity (<< 4:14.0.0)
-Breaks: kstreamripper-trinity (<< 4:14.0.0)
+Replaces: kstreamripper-kde3 (<< 4:14.0.0), kstreamripper-trinity (<< 4:14.0.0)
+Breaks: kstreamripper-kde3 (<< 4:14.0.0), kstreamripper-trinity (<< 4:14.0.0)
 Description: TDE frontend for streamripper
  KStreamRipper is a small frontend for the streamripper command 
  line utility. Streamripper captures internet shoutcast radio streams 
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/control b/ubuntu/maverick/applications/ksystemlog/debian/control
index 76fd1317b..942b16958 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/control
+++ b/ubuntu/maverick/applications/ksystemlog/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.4
 Package: ksystemlog-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: ksystemlog-trinity (<< 4:14.0.0)
-Breaks: ksystemlog-trinity (<< 4:14.0.0)
+Replaces: ksystemlog-kde3 (<< 4:14.0.0), ksystemlog-trinity (<< 4:14.0.0)
+Breaks: ksystemlog-kde3 (<< 4:14.0.0), ksystemlog-trinity (<< 4:14.0.0)
 Description: system log viewer tool for Trinity
  ksystemlog is a system log viewer tool for Trinity.
  .
diff --git a/ubuntu/maverick/applications/ktechlab/debian/control b/ubuntu/maverick/applications/ktechlab/debian/control
index 765916f8a..54b4b9448 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/control
+++ b/ubuntu/maverick/applications/ktechlab/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: ktechlab-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: ktechlab-trinity (<< 4:14.0.0)
-Breaks: ktechlab-trinity (<< 4:14.0.0)
+Replaces: ktechlab-kde3 (<< 4:14.0.0), ktechlab-trinity (<< 4:14.0.0)
+Breaks: ktechlab-kde3 (<< 4:14.0.0), ktechlab-trinity (<< 4:14.0.0)
 Recommends: gputils
 Description: circuit simulator for microcontrollers and electronics [Trinity]
  KTechlab is a circuit simulator with a nice, clickable and discoverable
diff --git a/ubuntu/maverick/applications/ktorrent/debian/control b/ubuntu/maverick/applications/ktorrent/debian/control
index cd9220c47..a05caebc0 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/control
+++ b/ubuntu/maverick/applications/ktorrent/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: ktorrent-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: ktorrent-trinity (<< 4:14.0.0)
-Breaks: ktorrent-trinity (<< 4:14.0.0)
+Replaces: ktorrent-kde3 (<< 4:14.0.0), ktorrent-trinity (<< 4:14.0.0)
+Breaks: ktorrent-kde3 (<< 4:14.0.0), ktorrent-trinity (<< 4:14.0.0)
 Suggests: php5-cli
 Recommends: tdebase-tdeio-plugins-trinity
 Description: BitTorrent client for Trinity
diff --git a/ubuntu/maverick/applications/kuickshow/debian/control b/ubuntu/maverick/applications/kuickshow/debian/control
index 08d878123..6b61ed31f 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/control
+++ b/ubuntu/maverick/applications/kuickshow/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: kuickshow-trinity
 Section: graphics
 Architecture: any
-Replaces: kuickshow-trinity (<< 4:14.0.0)
-Breaks: kuickshow-trinity (<< 4:14.0.0)
+Replaces: kuickshow-kde3 (<< 4:14.0.0), kuickshow-trinity (<< 4:14.0.0)
+Breaks: kuickshow-kde3 (<< 4:14.0.0), kuickshow-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Description: KDE image/slideshow viewer [Trinity]
diff --git a/ubuntu/maverick/applications/kvirc/debian/control b/ubuntu/maverick/applications/kvirc/debian/control
index 8f5023ee6..44ee184fa 100644
--- a/ubuntu/maverick/applications/kvirc/debian/control
+++ b/ubuntu/maverick/applications/kvirc/debian/control
@@ -11,8 +11,8 @@ Homepage: http://kvirc.net/
 Package: kvirc-trinity
 Architecture: any
 Depends: kvirc-data-trinity (= ${source:Version}), ${shlibs:Depends}
-Replaces: kvirc-trinity (<< 4:14.0.0)
-Breaks: kvirc-trinity (<< 4:14.0.0)
+Replaces: kvirc-kde3 (<< 4:14.0.0), kvirc-trinity (<< 4:14.0.0)
+Breaks: kvirc-kde3 (<< 4:14.0.0), kvirc-trinity (<< 4:14.0.0)
 Description:  Trinity based next generation IRC client with module support
  A highly configurable graphical IRC client with an MDI interface,
  built-in scripting language, support for IRC DCC, drag & drop file
@@ -26,8 +26,8 @@ Description:  Trinity based next generation IRC client with module support
 Package: kvirc-data-trinity
 Section: net
 Architecture: all
-Replaces: kvirc-data-trinity (<< 4:14.0.0)
-Breaks: kvirc-data-trinity (<< 4:14.0.0)
+Replaces: kvirc-data-kde3 (<< 4:14.0.0), kvirc-data-trinity (<< 4:14.0.0)
+Breaks: kvirc-data-kde3 (<< 4:14.0.0), kvirc-data-trinity (<< 4:14.0.0)
 Depends: kvirc-trinity (>= ${source:Version})
 Description: Data files for KVIrc
  This package contains the architecture-independent data needed by KVIrc in
@@ -43,8 +43,8 @@ Description: Data files for KVIrc
 Package: kvirc-trinity-dev
 Section: devel
 Architecture: any
-Replaces: kvirc-trinity-dev (<< 4:14.0.0)
-Breaks: kvirc-trinity-dev (<< 4:14.0.0)
+Replaces: kvirc-kde3-dev (<< 4:14.0.0), kvirc-trinity-dev (<< 4:14.0.0)
+Breaks: kvirc-kde3-dev (<< 4:14.0.0), kvirc-trinity-dev (<< 4:14.0.0)
 Depends: kvirc-trinity (>= ${source:Version})
 Description: Development files for KVIrc
  This package contains KVIrc libraries and include files you need if you
diff --git a/ubuntu/maverick/applications/kvkbd/debian/control b/ubuntu/maverick/applications/kvkbd/debian/control
index f61358dcf..bb6dacb4c 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/control
+++ b/ubuntu/maverick/applications/kvkbd/debian/control
@@ -9,8 +9,8 @@ Homepage: http://pan4os.info/main/index.php
 Package: kvkbd-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kvkbd-trinity (<< 4:14.0.0)
-Breaks: kvkbd-trinity (<< 4:14.0.0)
+Replaces: kvkbd-kde3 (<< 4:14.0.0), kvkbd-trinity (<< 4:14.0.0)
+Breaks: kvkbd-kde3 (<< 4:14.0.0), kvkbd-trinity (<< 4:14.0.0)
 Description: Virtual keyboard for KDE [Trinity]
  Virtual keyboard for KDE for use with accessibility. Application contains
  a systray widget as well as a dockwidget.
diff --git a/ubuntu/maverick/applications/piklab/debian/control b/ubuntu/maverick/applications/piklab/debian/control
index 81db97ac2..5d19c6c97 100644
--- a/ubuntu/maverick/applications/piklab/debian/control
+++ b/ubuntu/maverick/applications/piklab/debian/control
@@ -10,8 +10,8 @@ Homepage: http://piklab.sourceforge.net/
 Package: piklab-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: piklab-trinity (<< 4:14.0.0)
-Breaks: piklab-trinity (<< 4:14.0.0)
+Replaces: piklab-kde3 (<< 4:14.0.0), piklab-trinity (<< 4:14.0.0)
+Breaks: piklab-kde3 (<< 4:14.0.0), piklab-trinity (<< 4:14.0.0)
 Recommends: gputils, libusb-dev
 Suggests: sdcc (>= 2.5.0), sdcc-libraries
 Description: IDE for PIC-microcontroller development [Trinity]
diff --git a/ubuntu/maverick/applications/potracegui/debian/control b/ubuntu/maverick/applications/potracegui/debian/control
index 01aaf4e52..0fae08588 100644
--- a/ubuntu/maverick/applications/potracegui/debian/control
+++ b/ubuntu/maverick/applications/potracegui/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.4
 Package: potracegui-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, potrace
-Replaces: potracegui-trinity (<< 4:14.0.0)
-Breaks: potracegui-trinity (<< 4:14.0.0)
+Replaces: potracegui-kde3 (<< 4:14.0.0), potracegui-trinity (<< 4:14.0.0)
+Breaks: potracegui-kde3 (<< 4:14.0.0), potracegui-trinity (<< 4:14.0.0)
 Suggests: autotrace
 Description: KDE frontend for potrace [Trinity]
  A KDE interface for the commandline tracing tools potrace and/or autotrace. It
diff --git a/ubuntu/maverick/applications/rosegarden/debian/control b/ubuntu/maverick/applications/rosegarden/debian/control
index d29778110..fd5fdf1b6 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/control
+++ b/ubuntu/maverick/applications/rosegarden/debian/control
@@ -11,8 +11,8 @@ Homepage: http://www.rosegardenmusic.com/
 Package: rosegarden-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, khelpcenter-trinity, rosegarden-data-trinity (= ${source:Version}), libxml-twig-perl, sndfile-programs, xterm, tdebase-trinity-bin, konqueror-trinity | www-browser, flac
-Replaces: rosegarden-trinity (<< 4:14.0.0)
-Breaks: rosegarden-trinity (<< 4:14.0.0)
+Replaces: rosegarden-kde3 (<< 4:14.0.0), rosegarden-trinity (<< 4:14.0.0)
+Breaks: rosegarden-kde3 (<< 4:14.0.0), rosegarden-trinity (<< 4:14.0.0)
 Recommends: jackd, lilypond, swh-plugins | ladspa-plugin
 Suggests: qjackctl
 Description: music editor and MIDI/audio sequencer [Trinity]
@@ -24,8 +24,8 @@ Description: music editor and MIDI/audio sequencer [Trinity]
 Package: rosegarden-data-trinity
 Architecture: all
 Recommends: rosegarden-trinity
-Replaces: rosegarden-data-trinity (<< 4:14.0.0)
-Breaks: rosegarden-data-trinity (<< 4:14.0.0)
+Replaces: rosegarden-data-kde3 (<< 4:14.0.0), rosegarden-data-trinity (<< 4:14.0.0)
+Breaks: rosegarden-data-kde3 (<< 4:14.0.0), rosegarden-data-trinity (<< 4:14.0.0)
 Priority: optional
 Description: music editor and MIDI/audio sequencer data files [Trinity]
  Rosegarden is a KDE application which provides a mixed Audio/MIDI
diff --git a/ubuntu/maverick/applications/smb4k/debian/control b/ubuntu/maverick/applications/smb4k/debian/control
index b2b2b9730..29995cc82 100644
--- a/ubuntu/maverick/applications/smb4k/debian/control
+++ b/ubuntu/maverick/applications/smb4k/debian/control
@@ -9,8 +9,8 @@ Homepage: http://smb4k.berlios.de/
 Package: smb4k-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, samba-common, smbclient, smbfs
-Replaces: smb4k-trinity (<< 4:14.0.0)
-Breaks: smb4k-trinity (<< 4:14.0.0)
+Replaces: smb4k-kde3 (<< 4:14.0.0), smb4k-trinity (<< 4:14.0.0)
+Breaks: smb4k-kde3 (<< 4:14.0.0), smb4k-trinity (<< 4:14.0.0)
 Recommends: super | sudo-trinity
 Description: A Samba (SMB) share advanced browser for Trinity
  Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software 
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/control b/ubuntu/maverick/applications/soundkonverter/debian/control
index 7d72a263c..f1ced29ce 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/control
+++ b/ubuntu/maverick/applications/soundkonverter/debian/control
@@ -10,8 +10,8 @@ Homepage: http://www.kde-apps.org/content/show.php?content=29024
 Package: soundkonverter-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: soundkonverter-trinity (<< 4:14.0.0)
-Breaks: soundkonverter-trinity (<< 4:14.0.0)
+Replaces: soundkonverter-kde3 (<< 4:14.0.0), soundkonverter-trinity (<< 4:14.0.0)
+Breaks: soundkonverter-kde3 (<< 4:14.0.0), soundkonverter-trinity (<< 4:14.0.0)
 Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-tdeio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack
 Suggests: soundkonverter-amarok-trinity
 Description: audio converter frontend for Trinity
@@ -34,8 +34,8 @@ Description: audio converter frontend for Trinity
 Package: soundkonverter-amarok-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, soundkonverter-trinity, amarok-trinity, ruby, libqt0-ruby1.8-trinity
-Replaces: soundkonverter-amarok-trinity (<< 4:14.0.0)
-Breaks: soundkonverter-amarok-trinity (<< 4:14.0.0)
+Replaces: soundkonverter-amarok-kde3 (<< 4:14.0.0), soundkonverter-amarok-trinity (<< 4:14.0.0)
+Breaks: soundkonverter-amarok-kde3 (<< 4:14.0.0), soundkonverter-amarok-trinity (<< 4:14.0.0)
 Description: audio converter frontend for Trinity (Amarok script)
  Amarok script for soundKonverter. It allows you to easily transcode files when
  transferring them to your media device.
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control
index 1e6619c82..fdbdb54a3 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/maverick/applications/tde-guidance/debian/control
@@ -13,8 +13,8 @@ Standards-Version: 3.8.4
 Package: tde-guidance-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
-Replaces: kde-guidance-trinity (<< 4:14.0.0)
-Breaks: kde-guidance-trinity (<< 4:14.0.0)
+Replaces: kde-guidance-kde3 (<< 4:14.0.0), kde-guidance-trinity (<< 4:14.0.0)
+Breaks: kde-guidance-kde3 (<< 4:14.0.0), kde-guidance-trinity (<< 4:14.0.0)
 Conflicts: guidance-power-manager, tde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [Trinity]
@@ -34,8 +34,8 @@ Description: collection of KDE system administration tools for GNU/Linux [Trinit
 Package: guidance-backends-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
-Replaces: guidance-backends-trinity (<< 4:14.0.0)
-Breaks: guidance-backends-trinity (<< 4:14.0.0)
+Replaces: guidance-backends-kde3 (<< 4:14.0.0), guidance-backends-trinity (<< 4:14.0.0)
+Breaks: guidance-backends-kde3 (<< 4:14.0.0), guidance-backends-trinity (<< 4:14.0.0)
 Conflicts: guidance-power-manager, tde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of system administration tools for GNU/Linux [Trinity]
@@ -47,8 +47,8 @@ Description: collection of system administration tools for GNU/Linux [Trinity]
 Package: tde-guidance-powermanager-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
-Replaces: kde-guidance-powermanager-trinity (<< 4:14.0.0)
-Breaks: kde-guidance-powermanager-trinity (<< 4:14.0.0)
+Replaces: kde-guidance-powermanager-kde3 (<< 4:14.0.0), kde-guidance-powermanager-trinity (<< 4:14.0.0)
+Breaks: kde-guidance-powermanager-kde3 (<< 4:14.0.0), kde-guidance-powermanager-trinity (<< 4:14.0.0)
 Conflicts: guidance-power-manager, tde-guidance-powermanager
 Provides: ${python:Provides}
 Description: HAL based power manager applet [Trinity]
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/control b/ubuntu/maverick/applications/tde-style-lipstik/debian/control
index 0b5857188..151cc5719 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/control
+++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: tde-style-lipstik-trinity
 Section: tde
 Architecture: any
-Replaces: kde-style-lipstik-trinity (<< 4:14.0.0)
-Breaks: kde-style-lipstik-trinity (<< 4:14.0.0)
+Replaces: kde-style-lipstik-kde3 (<< 4:14.0.0), kde-style-lipstik-trinity (<< 4:14.0.0)
+Breaks: kde-style-lipstik-kde3 (<< 4:14.0.0), kde-style-lipstik-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Lipstik style for TDE
  Based on the plastik style, Lipstik is a purified style with many options to
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control
index 9c8bf4103..1f6f98514 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: tde-style-qtcurve-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kde-style-qtcurve-trinity (<< 4:14.0.0)
-Breaks: kde-style-qtcurve-trinity (<< 4:14.0.0)
+Replaces: kde-style-qtcurve-kde3 (<< 4:14.0.0), kde-style-qtcurve-trinity (<< 4:14.0.0)
+Breaks: kde-style-qtcurve-kde3 (<< 4:14.0.0), kde-style-qtcurve-trinity (<< 4:14.0.0)
 Recommends: gtk2-engines-qtcurve
 Provides: tde-style-qtcurve
 Description: This is a set of widget styles for Trinity based apps
@@ -23,8 +23,8 @@ Description: This is a set of widget styles for Trinity based apps
 Package: qtcurve-trinity
 Architecture: any
 Depends: tde-style-qtcurve-trinity, gtk2-engines-qtcurve
-Replaces: qtcurve-trinity (<< 4:14.0.0)
-Breaks: qtcurve-trinity (<< 4:14.0.0)
+Replaces: qtcurve-kde3 (<< 4:14.0.0), qtcurve-trinity (<< 4:14.0.0)
+Breaks: qtcurve-kde3 (<< 4:14.0.0), qtcurve-trinity (<< 4:14.0.0)
 Description: This is a set of widget styles for Trinity and Gtk2 based apps
  This is an empty dummy package which will drag the packages 
  tde-style-qtcurve and gtk2-engines-qtcurve in your system.
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/control b/ubuntu/maverick/applications/tde-systemsettings/debian/control
index f87bb4fd6..e410bf21c 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/control
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: tde-systemsettings-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol-trinity
-Replaces: kde-systemsettings-trinity (<< 4:14.0.0)
-Breaks: kde-systemsettings-trinity (<< 4:14.0.0)
+Replaces: kde-systemsettings-kde3 (<< 4:14.0.0), kde-systemsettings-trinity (<< 4:14.0.0)
+Breaks: kde-systemsettings-kde3 (<< 4:14.0.0), kde-systemsettings-trinity (<< 4:14.0.0)
 Description: easy to use control centre for TDE
  System preferences is a replacement for the TDE
  Control Centre with an improved user interface.
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/control b/ubuntu/maverick/applications/tdeio-apt/debian/control
index d838074e9..48b0be617 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/control
+++ b/ubuntu/maverick/applications/tdeio-apt/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: tdeio-apt-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, apt, adept-batch-trinity
-Replaces: kio-apt-trinity (<< 4:14.0.0)
-Breaks: kio-apt-trinity (<< 4:14.0.0)
+Replaces: kio-apt-kde3 (<< 4:14.0.0), kio-apt-trinity (<< 4:14.0.0)
+Breaks: kio-apt-kde3 (<< 4:14.0.0), kio-apt-trinity (<< 4:14.0.0)
 Description: an apt-cache ioslave for Trinity
  tdeio-apt is an ioslave which provides the apt:/ protocol. It
  integrates apt-cache functionalities into Konqueror, making
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/control b/ubuntu/maverick/applications/tdeio-locate/debian/control
index d49db68f2..c31649e49 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/control
+++ b/ubuntu/maverick/applications/tdeio-locate/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: tdeio-locate-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kio-locate-trinity (<< 4:14.0.0)
-Breaks: kio-locate-trinity (<< 4:14.0.0)
+Replaces: kio-locate-kde3 (<< 4:14.0.0), kio-locate-trinity (<< 4:14.0.0)
+Breaks: kio-locate-kde3 (<< 4:14.0.0), kio-locate-trinity (<< 4:14.0.0)
 Description: tdeio-slave for the locate command [Trinity]
  Adds support for the "locate:" and "locater:"
  protocols to Konqueror and other KDE applications.
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control
index 6b6b2d3c3..d3aa5f746 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: tdeio-umountwrapper-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kio-umountwrapper-trinity (<< 4:14.0.0)
-Breaks: kio-umountwrapper-trinity (<< 4:14.0.0)
+Replaces: kio-umountwrapper-kde3 (<< 4:14.0.0), kio-umountwrapper-trinity (<< 4:14.0.0)
+Breaks: kio-umountwrapper-kde3 (<< 4:14.0.0), kio-umountwrapper-trinity (<< 4:14.0.0)
 Description: progress dialog for safely removing devices in Trinity.
  Wrapper around tdeio_media_mountwrapper.
  Provides a progress dialog for Safely Removing of devices in Trinity.
diff --git a/ubuntu/maverick/applications/tderadio/debian/control b/ubuntu/maverick/applications/tderadio/debian/control
index 0ee221579..7f4043dc6 100644
--- a/ubuntu/maverick/applications/tderadio/debian/control
+++ b/ubuntu/maverick/applications/tderadio/debian/control
@@ -9,8 +9,8 @@ Homepage: http://tderadio.sourceforge.net/
 Package: tderadio-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kradio-trinity (<< 4:14.0.0)
-Breaks: kradio-trinity (<< 4:14.0.0)
+Replaces: kradio-kde3 (<< 4:14.0.0), kradio-trinity (<< 4:14.0.0)
+Breaks: kradio-kde3 (<< 4:14.0.0), kradio-trinity (<< 4:14.0.0)
 Description: Comfortable Radio Application for KDE [Trinity]
  TDERadio is a comfortable radio application for KDE 3.x with support for 
  V4L and V4L2 radio cards drivers.
diff --git a/ubuntu/maverick/applications/tdesudo/debian/control b/ubuntu/maverick/applications/tdesudo/debian/control
index 57075b9d5..3ff3f6fb9 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/control
+++ b/ubuntu/maverick/applications/tdesudo/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
 Package: tdesudo-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, sudo
-Replaces: kdesudo-trinity (<< 4:14.0.0)
-Breaks: kdesudo-trinity (<< 4:14.0.0)
+Replaces: kdesudo-kde3 (<< 4:14.0.0), kdesudo-trinity (<< 4:14.0.0)
+Breaks: kdesudo-kde3 (<< 4:14.0.0), kdesudo-trinity (<< 4:14.0.0)
 Description: sudo frontend for Trinity
  KdeSudo is a graphical frontend for the sudo utility.
  It allows you to run programs as another user by entering your password.
diff --git a/ubuntu/maverick/applications/tdesvn/debian/control b/ubuntu/maverick/applications/tdesvn/debian/control
index faaeb13f8..54361e186 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/control
+++ b/ubuntu/maverick/applications/tdesvn/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: libsvnqt4-trinity
 Section: libs
 Architecture: any
-Replaces: libsvnqt4-trinity (<< 4:14.0.0)
-Breaks: libsvnqt4-trinity (<< 4:14.0.0)
+Replaces: libsvnqt4-kde3 (<< 4:14.0.0), libsvnqt4-trinity (<< 4:14.0.0)
+Breaks: libsvnqt4-kde3 (<< 4:14.0.0), libsvnqt4-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Qt wrapper library for subversion [Trinity]
  This package provides svnqt, a Qt wrapper library around the 
@@ -22,8 +22,8 @@ Description: Qt wrapper library for subversion [Trinity]
 Package: libsvnqt-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libsvnqt-trinity-dev (<< 4:14.0.0)
-Breaks: libsvnqt-trinity-dev (<< 4:14.0.0)
+Replaces: libsvnqt-kde3-dev (<< 4:14.0.0), libsvnqt-trinity-dev (<< 4:14.0.0)
+Breaks: libsvnqt-kde3-dev (<< 4:14.0.0), libsvnqt-trinity-dev (<< 4:14.0.0)
 Depends: libsvnqt4-trinity (= ${binary:Version}), libqt3-mt-dev, libsvn-dev
 Description: Qt wrapper library for subversion (development files) [Trinity]
  This package contains the header files and symbolic links that developers
@@ -32,8 +32,8 @@ Description: Qt wrapper library for subversion (development files) [Trinity]
 Package: tdesvn-trinity
 Section: devel
 Architecture: any
-Replaces: kdesvn-trinity (<< 4:14.0.0)
-Breaks: kdesvn-trinity (<< 4:14.0.0)
+Replaces: kdesvn-kde3 (<< 4:14.0.0), kdesvn-trinity (<< 4:14.0.0)
+Breaks: kdesvn-kde3 (<< 4:14.0.0), kdesvn-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
 Recommends: kompare-trinity, graphviz
 Suggests: khelpcenter-trinity, kdiff3-trinity
@@ -48,8 +48,8 @@ Description: subversion client with tight KDE integration [Trinity]
 Package: tdesvn-tdeio-plugins-trinity
 Section: devel
 Architecture: any
-Replaces: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
-Breaks: kdesvn-kio-plugins-trinity (<< 4:14.0.0)
+Replaces: kdesvn-kio-plugins-kde3 (<< 4:14.0.0), kdesvn-kio-plugins-trinity (<< 4:14.0.0)
+Breaks: kdesvn-kio-plugins-kde3 (<< 4:14.0.0), kdesvn-kio-plugins-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: tdesdk-tdeio-plugins-trinity
 Description: subversion I/O slaves for Trinity
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/control b/ubuntu/maverick/applications/tdmtheme/debian/control
index 036c5c0d9..697962168 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/control
+++ b/ubuntu/maverick/applications/tdmtheme/debian/control
@@ -12,8 +12,8 @@ Homepage: http://beta.smileaf.org/projects
 Package: tdmtheme-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, tdm-trinity
-Replaces: kdmtheme-trinity (<< 4:14.0.0)
-Breaks: kdmtheme-trinity (<< 4:14.0.0)
+Replaces: kdmtheme-kde3 (<< 4:14.0.0), kdmtheme-trinity (<< 4:14.0.0)
+Breaks: kdmtheme-kde3 (<< 4:14.0.0), kdmtheme-trinity (<< 4:14.0.0)
 Description: theme manager for TDM [Trinity]
  tdmtheme is a theme manager for TDM. It provides a KDE Control Module (KCM)
  that allows you to easily install, remove and change your TDM themes.
diff --git a/ubuntu/maverick/applications/tellico/debian/control b/ubuntu/maverick/applications/tellico/debian/control
index 7a166ddb7..853a7798a 100644
--- a/ubuntu/maverick/applications/tellico/debian/control
+++ b/ubuntu/maverick/applications/tellico/debian/control
@@ -10,8 +10,8 @@ Homepage: http://periapsis.org/tellico/
 Package: tellico-trinity
 Architecture: any
 Depends: tellico-data-trinity (= ${source:Version}), tellico-scripts-trinity, ${shlibs:Depends}
-Replaces: tellico-trinity (<< 4:14.0.0)
-Breaks: tellico-trinity (<< 4:14.0.0)
+Replaces: tellico-kde3 (<< 4:14.0.0), tellico-trinity (<< 4:14.0.0)
+Breaks: tellico-kde3 (<< 4:14.0.0), tellico-trinity (<< 4:14.0.0)
 Description: collection manager for books, videos, music [Trinity]
  Tellico is a collection manager for KDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
@@ -29,8 +29,8 @@ Description: collection manager for books, videos, music [Trinity]
 Package: tellico-data-trinity
 Architecture: all
 Depends: tdelibs-data-trinity
-Replaces: tellico-data-trinity (<< 4:14.0.0)
-Breaks: tellico-data-trinity (<< 4:14.0.0)
+Replaces: tellico-data-kde3 (<< 4:14.0.0), tellico-data-trinity (<< 4:14.0.0)
+Breaks: tellico-data-kde3 (<< 4:14.0.0), tellico-data-trinity (<< 4:14.0.0)
 Recommends: tellico-trinity
 Suggests: python
 Description: collection manager for books, videos, music [data] [Trinity]
@@ -53,8 +53,8 @@ Description: collection manager for books, videos, music [data] [Trinity]
 Package: tellico-scripts-trinity
 Architecture: all
 Recommends: tellico-trinity
-Replaces: tellico-scripts-trinity (<< 4:14.0.0)
-Breaks: tellico-scripts-trinity (<< 4:14.0.0)
+Replaces: tellico-scripts-kde3 (<< 4:14.0.0), tellico-scripts-trinity (<< 4:14.0.0)
+Breaks: tellico-scripts-kde3 (<< 4:14.0.0), tellico-scripts-trinity (<< 4:14.0.0)
 Suggests: python, ruby
 Description: collection manager for books, videos, music [scripts] [Trinity]
  Tellico is a collection manager for KDE. It includes default collections for
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/control b/ubuntu/maverick/applications/twin-style-crystal/debian/control
index a5a93ab76..e5de77106 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/control
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: twin-style-crystal-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kwin-style-crystal-trinity (<< 4:14.0.0)
-Breaks: kwin-style-crystal-trinity (<< 4:14.0.0)
+Replaces: kwin-style-crystal-kde3 (<< 4:14.0.0), kwin-style-crystal-trinity (<< 4:14.0.0)
+Breaks: kwin-style-crystal-kde3 (<< 4:14.0.0), kwin-style-crystal-trinity (<< 4:14.0.0)
 Description: semi transparant window decoration for Trinity
  Crystal offers you pseudo transparent titlebar, buttons and borders
  transparent, so you can see more of your lovely background image
diff --git a/ubuntu/maverick/applications/wlassistant/debian/control b/ubuntu/maverick/applications/wlassistant/debian/control
index 27fe953bb..8d530ca67 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/control
+++ b/ubuntu/maverick/applications/wlassistant/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: wlassistant-trinity
 Architecture: any
 Depends: kicker-trinity, net-tools, wireless-tools, menu, ${shlibs:Depends}
-Replaces: wlassistant-trinity (<< 4:14.0.0)
-Breaks: wlassistant-trinity (<< 4:14.0.0)
+Replaces: wlassistant-kde3 (<< 4:14.0.0), wlassistant-trinity (<< 4:14.0.0)
+Breaks: wlassistant-kde3 (<< 4:14.0.0), wlassistant-trinity (<< 4:14.0.0)
 Recommends: dhcp3-client | dhcp-client | dhcpcd
 Description: User friendly KDE frontend for wireless network connection [Trinity]
  Wireless Assistant scans for wireless access points and displays link quality,
diff --git a/ubuntu/maverick/applications/yakuake/debian/control b/ubuntu/maverick/applications/yakuake/debian/control
index 57a8fe588..d41fca309 100644
--- a/ubuntu/maverick/applications/yakuake/debian/control
+++ b/ubuntu/maverick/applications/yakuake/debian/control
@@ -10,8 +10,8 @@ Homepage: http://extragear.kde.org/apps/yakuake/
 Package: yakuake-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, konsole-trinity
-Replaces: yakuake-trinity (<< 4:14.0.0)
-Breaks: yakuake-trinity (<< 4:14.0.0)
+Replaces: yakuake-kde3 (<< 4:14.0.0), yakuake-trinity (<< 4:14.0.0)
+Breaks: yakuake-kde3 (<< 4:14.0.0), yakuake-trinity (<< 4:14.0.0)
 Description: a Quake-style terminal emulator based on KDE Konsole technology [Trinity]
  YaKuake is inspired from the terminal in the Quake game: when you press a key 
  (by default F12, but that can be changed) a terminal window slides down from