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

144 files changed, 238 insertions, 370 deletions

diff --git a/debian/lenny/applications/amarok/debian/control b/debian/lenny/applications/amarok/debian/control
index 0ada041f5..9805dce74 100644
--- a/debian/lenny/applications/amarok/debian/control
+++ b/debian/lenny/applications/amarok/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
 Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
  tdelibs4-trinity-dev,
  libxine-dev, libdbus-tqt-1-dev,
- libtag1-dev, libsqlite3-dev, libtunepimp-dev,
+ libtag1-dev, libsqlite3-dev,
  libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
  libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev,
diff --git a/debian/lenny/applications/basket/debian/control b/debian/lenny/applications/basket/debian/control
index 94bc81285..00a63c8f7 100644
--- a/debian/lenny/applications/basket/debian/control
+++ b/debian/lenny/applications/basket/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, debhelper (>= 5), tdelibs4-trinity-dev (>= 4:3.5.6), tdepim-trinity-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, debhelper (>= 5), tdelibs4-trinity-dev, tdepim-trinity-dev, libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: basket-trinity
diff --git a/debian/lenny/applications/koffice/debian/control b/debian/lenny/applications/koffice/debian/control
index 447aef218..b48e508be 100644
--- a/debian/lenny/applications/koffice/debian/control
+++ b/debian/lenny/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
diff --git a/debian/lenny/applications/kuickshow/debian/control b/debian/lenny/applications/kuickshow/debian/control
index 7cc247af5..08d878123 100644
--- a/debian/lenny/applications/kuickshow/debian/control
+++ b/debian/lenny/applications/kuickshow/debian/control
@@ -2,7 +2,7 @@ Source: kuickshow-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev, imlib11-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kuickshow-trinity
diff --git a/debian/lenny/applications/kuickshow/debian/control.in b/debian/lenny/applications/kuickshow/debian/control.in
index 9154c1196..e28d93dd3 100644
--- a/debian/lenny/applications/kuickshow/debian/control.in
+++ b/debian/lenny/applications/kuickshow/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: kuickshow-trinity
diff --git a/debian/lenny/applications/kvirc/debian/rules b/debian/lenny/applications/kvirc/debian/rules
index 2ed9f4000..47b413288 100755
--- a/debian/lenny/applications/kvirc/debian/rules
+++ b/debian/lenny/applications/kvirc/debian/rules
@@ -82,6 +82,8 @@ common-install-indep::
 	mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/hicolor
 	mkdir -p $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons
 	mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/hicolor $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons/
+
+common-install-arch::
 	mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/lib/
 
 post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/tdeaccessibility/debian/control.in b/debian/lenny/tdeaccessibility/debian/control.in
index 50e869602..70dea8a79 100644
--- a/debian/lenny/tdeaccessibility/debian/control.in
+++ b/debian/lenny/tdeaccessibility/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, tdelibs4-dev (>= 4:3.5.8), tdemultimedia-dev (>= 4:3.5.8), libakode-dev, libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, tdelibs4-dev, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
 Standards-Version: 3.7.2
 
 Package: tdeaccessibility
diff --git a/debian/lenny/tdeaccessibility/debian/rules b/debian/lenny/tdeaccessibility/debian/rules
index ce879ebd4..f5c6caf43 100755
--- a/debian/lenny/tdeaccessibility/debian/rules
+++ b/debian/lenny/tdeaccessibility/debian/rules
@@ -20,8 +20,5 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdeaccessibility-trinity-dbg
 
 PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kttsd-trinity	:= -V'kttsd-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksayit-trinity	:= -V'ksayit-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
diff --git a/debian/lenny/tdeaddons/debian/control.in b/debian/lenny/tdeaddons/debian/control.in
index 1a2fa68b7..86eedbb08 100644
--- a/debian/lenny/tdeaddons/debian/control.in
+++ b/debian/lenny/tdeaddons/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), atlantik-dev (>= 4:3.5.8), tdebase-dev (>= 4:3.5.8), tdemultimedia-dev (>= 4:3.5.8), libtdegames-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), tdepim-dev (>= 4:3.5.8), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.6++-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, atlantik-dev, tdebase-dev, tdemultimedia-dev, libtdegames-dev, libkonq4-dev, tdepim-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.6++-dev
 Standards-Version: 3.7.2
 
 Package: tdeaddons
diff --git a/debian/lenny/tdeadmin/debian/control b/debian/lenny/tdeadmin/debian/control
index f16fedd99..ec538087d 100644
--- a/debian/lenny/tdeadmin/debian/control
+++ b/debian/lenny/tdeadmin/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-trinity-dev, libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeadmin-trinity
diff --git a/debian/lenny/tdeadmin/debian/control.in b/debian/lenny/tdeadmin/debian/control.in
index d45089be7..59b842cd2 100644
--- a/debian/lenny/tdeadmin/debian/control.in
+++ b/debian/lenny/tdeadmin/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-dev (>= 4:3.5.7), libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-dev, libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
 Standards-Version: 3.7.2
 
 Package: tdeadmin
diff --git a/debian/lenny/tdeartwork/debian/control.in b/debian/lenny/tdeartwork/debian/control.in
index 4f600ea19..1721be0bf 100644
--- a/debian/lenny/tdeartwork/debian/control.in
+++ b/debian/lenny/tdeartwork/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev, gawk, gettext, sharutils, tdebase-dev, twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.7.2
 
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 380ce79f9..544ab4893 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
@@ -140,7 +140,7 @@ Section: devel
 Architecture: any
 Replaces: kdebase-trinity-dev (<< 4:14.0.0)
 Breaks: kdebase-trinity-dev (<< 4:14.0.0)
-Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
  compile software based on the KDE base module.
@@ -578,7 +578,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkonq4-trinity-dev (<< 4:14.0.0)
 Breaks: libkonq4-trinity-dev (<< 4:14.0.0)
-Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: libkonq-trinity-dev (<< 4:3.0.0), libkonq3-trinity (<< 4:3.0.0)
 Description: development files for Konqueror's core libraries
  This package contains headers and other development files for the core
diff --git a/debian/lenny/tdebase/debian/control.in b/debian/lenny/tdebase/debian/control.in
index 2c874cc69..7a229ecba 100644
--- a/debian/lenny/tdebase/debian/control.in
+++ b/debian/lenny/tdebase/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.7.3
@@ -121,7 +121,7 @@ Description: shared data files for the KDE base module
 Package: tdebase-dev
 Section: devel
 Architecture: any
-Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), twin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), twin (= ${Source-Version}), tdelibs4-dev
 Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
@@ -518,7 +518,7 @@ Description: core libraries for Konqueror
 Package: libkonq4-dev
 Section: libdevel
 Architecture: any
-Depends: libkonq4 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libkonq4 (= ${Source-Version}), tdelibs4-dev
 Conflicts: libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
 Replaces: tdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
 Description: development files for Konqueror's core libraries
diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules
index 49932893e..62ae28933 100755
--- a/debian/lenny/tdebase/debian/rules
+++ b/debian/lenny/tdebase/debian/rules
@@ -38,16 +38,6 @@ DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach ki
 PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
 			ksysguard-trinity twin-trinity libkonq4-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kate-trinity		:= -V'kate-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kcontrol-trinity		:= -V'kcontrol-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_tdebase-trinity-bin		:= -V'tdebase-trinity-bin (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kicker-trinity		:= -V'kicker-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_konqueror-trinity		:= -V'konqueror-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksplash-trinity		:= -V'ksplash-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksysguard-trinity		:= -V'ksysguard-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_twin-trinity		:= -V'twin-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libkonq4-trinity		:= -V'libkonq4-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/debian/lenny/tdebindings/debian/control b/debian/lenny/tdebindings/debian/control
index 55d1ec903..a60ef4874 100644
--- a/debian/lenny/tdebindings/debian/control
+++ b/debian/lenny/tdebindings/debian/control
@@ -2,7 +2,7 @@ Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
- tdelibs4-trinity-dev (>= 4:3.5.9), libtqt3-compat-headers (>= 3:3.3.5),
+ tdelibs4-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby1.8-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
 Section: devel
diff --git a/debian/lenny/tdebindings/debian/control.in b/debian/lenny/tdebindings/debian/control.in
index 998cde21d..e889fa579 100644
--- a/debian/lenny/tdebindings/debian/control.in
+++ b/debian/lenny/tdebindings/debian/control.in
@@ -2,7 +2,7 @@ Source: tdebindings
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
- tdelibs4-dev (>= 4:3.5.7), libgtk1.2-dev, libqt3-compat-headers (>= 3:3.3.5),
+ tdelibs4-dev, libgtk1.2-dev, libqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby1.8-dev
 Section: devel
 Priority: optional
diff --git a/debian/lenny/tdeedu/debian/control b/debian/lenny/tdeedu/debian/control
index b701b5e17..b400fada5 100644
--- a/debian/lenny/tdeedu/debian/control
+++ b/debian/lenny/tdeedu/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeedu-trinity
@@ -550,7 +550,7 @@ Architecture: any
 Section: libdevel
 Replaces: libkdeedu-trinity-dev (<< 4:14.0.0)
 Breaks: libkdeedu-trinity-dev (<< 4:14.0.0)
-Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for Trinity educational library
  The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
@@ -586,7 +586,7 @@ Architecture: any
 Section: libdevel
 Replaces: libkiten-trinity-dev (<< 4:14.0.0)
 Breaks: libkiten-trinity-dev (<< 4:14.0.0)
-Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for Kiten library
  Kiten is a Japanese reference/study tool for KDE.  The library
  libkiten contains portions of Kiten that may be useful for other
diff --git a/debian/lenny/tdeedu/debian/control.in b/debian/lenny/tdeedu/debian/control.in
index 28384cd2c..1e39e143a 100644
--- a/debian/lenny/tdeedu/debian/control.in
+++ b/debian/lenny/tdeedu/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
 Standards-Version: 3.7.2
 
 Package: tdeedu
@@ -497,7 +497,7 @@ Description: library for use with KDE educational apps
 Package: libtdeedu-dev
 Architecture: any
 Section: libdevel
-Depends: libtdeedu3 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libtdeedu3 (= ${Source-Version}), tdelibs4-dev
 Description: development files for KDE educational library
  The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
@@ -530,7 +530,7 @@ Description: library for Kiten Japanese reference/study tool
 Package: libkiten-dev
 Architecture: any
 Section: libdevel
-Depends: libkiten1 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libkiten1 (= ${Source-Version}), tdelibs4-dev
 Description: development files for Kiten library
  Kiten is a Japanese reference/study tool for KDE.  The library
  libkiten contains portions of Kiten that may be useful for other
diff --git a/debian/lenny/tdeedu/debian/rules b/debian/lenny/tdeedu/debian/rules
index 2c6198c42..d1258cdf0 100755
--- a/debian/lenny/tdeedu/debian/rules
+++ b/debian/lenny/tdeedu/debian/rules
@@ -49,7 +49,7 @@ DEB_INSTALL_DOCS_ALL :=
 
 DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
 
-DEB_DH_MAKESHLIBS_ARGS_libtdeedu3-trinity := -V'libtdeedu3-trinity (>= 4:3.5.8)'
-DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity (>= 4:3.5.8)'
+DEB_DH_MAKESHLIBS_ARGS_libtdeedu3-trinity := -V'libtdeedu3-trinity'
+DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity'
 
 PACKAGES_WITH_LIBS := libtdeedu3-trinity libkiten1-trinity kvoctrain-trinity
diff --git a/debian/lenny/tdegames/debian/control b/debian/lenny/tdegames/debian/control
index 42e2c7e39..9a34a3f46 100644
--- a/debian/lenny/tdegames/debian/control
+++ b/debian/lenny/tdegames/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
@@ -76,7 +76,7 @@ Architecture: any
 Section: libdevel
 Replaces: libkdegames-trinity-dev (<< 4:14.0.0)
 Breaks: libkdegames-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev (>= 4:3.5.1), libtdegames1-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, libtdegames1-trinity (= ${Source-Version})
 Description: Trinity games library headers
  This package is necessary if you want to develop your own games using
  the KDE games library.
diff --git a/debian/lenny/tdegames/debian/control.in b/debian/lenny/tdegames/debian/control.in
index f1f898320..e4d234b34 100644
--- a/debian/lenny/tdegames/debian/control.in
+++ b/debian/lenny/tdegames/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, tdelibs4-doc
 Standards-Version: 3.7.2
 
@@ -66,7 +66,7 @@ Description: debugging symbols for tdegames
 Package: libtdegames-dev
 Architecture: any
 Section: libdevel
-Depends: tdelibs4-dev (>= 4:3.5.1), libtdegames1 (= ${Source-Version})
+Depends: tdelibs4-dev, libtdegames1 (= ${Source-Version})
 Description: KDE games library headers
  This package is necessary if you want to develop your own games using
  the KDE games library.
diff --git a/debian/lenny/tdegames/debian/rules b/debian/lenny/tdegames/debian/rules
index 15b61b8c0..a979e0440 100755
--- a/debian/lenny/tdegames/debian/rules
+++ b/debian/lenny/tdegames/debian/rules
@@ -26,7 +26,7 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if
 
 DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog
 
-DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity (>= 4:3.5.8)'
+DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity'
 DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V
 DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V
 
diff --git a/debian/lenny/tdegraphics/debian/control b/debian/lenny/tdegraphics/debian/control
index fa0f2c8f9..f9d000509 100644
--- a/debian/lenny/tdegraphics/debian/control
+++ b/debian/lenny/tdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdegraphics-trinity
@@ -76,7 +76,7 @@ Section: devel
 Architecture: any
 Replaces: kdegraphics-trinity-dev (<< 4:14.0.0)
 Breaks: kdegraphics-trinity-dev (<< 4:14.0.0)
-Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs4-trinity-dev
 Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
@@ -376,7 +376,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkscan-trinity-dev (<< 4:14.0.0)
 Breaks: libkscan-trinity-dev (<< 4:14.0.0)
-Depends: libkscan1-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkscan1-trinity (= ${binary:Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
  .
diff --git a/debian/lenny/tdegraphics/debian/control.in b/debian/lenny/tdegraphics/debian/control.in
index 678200a9a..f84b69851 100644
--- a/debian/lenny/tdegraphics/debian/control.in
+++ b/debian/lenny/tdegraphics/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, tdelibs4-dev (>= 4:3.5.6), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, tdelibs4-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
 Package: tdegraphics
@@ -66,7 +66,7 @@ Description: a color palette editor and color picker for KDE
 Package: tdegraphics-dev
 Section: devel
 Architecture: any
-Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), tdelibs4-dev
 Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
@@ -350,7 +350,7 @@ Description: generic framework for viewer applications in KDE
 Package: libkscan-dev
 Section: libdevel
 Architecture: any
-Depends: libkscan1 (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libkscan1 (= ${binary:Version}), tdelibs4-dev
 Description: development files for the KDE scanner library
  This package contains development files for KDE's scanner library.
  .
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index 6e306e4bf..b81a9614a 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,
diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules
index 2e2bdf3ee..a88ed600f 100755
--- a/debian/lenny/tdelibs/debian/rules
+++ b/debian/lenny/tdelibs/debian/rules
@@ -35,8 +35,6 @@ DEB_FIXPERMS_EXCLUDE := \
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdelibs-trinity-dbg
 
-DEB_DH_MAKESHLIBS_ARGS_tdelibs4c2a-trinity := -V'tdelibs4c2a-trinity (>= 4:3.5.8-1)'
-
 binary-install/tdelibs-data-trinity::
 	install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
 	install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
diff --git a/debian/lenny/tdemultimedia/debian/control b/debian/lenny/tdemultimedia/debian/control
index 4cf40192e..71e6c32f4 100644
--- a/debian/lenny/tdemultimedia/debian/control
+++ b/debian/lenny/tdemultimedia/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdemultimedia-trinity
@@ -31,7 +31,7 @@ Section: devel
 Architecture: any
 Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev (>= 4:3.5.7), artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
 Conflicts: libmpeg-trinity-dev
 Description: development files for the Trinity multimedia module
  Development files and headers for the Trinity multimedia module.
diff --git a/debian/lenny/tdemultimedia/debian/control.in b/debian/lenny/tdemultimedia/debian/control.in
index 7487b21fb..7b20cca6d 100644
--- a/debian/lenny/tdemultimedia/debian/control.in
+++ b/debian/lenny/tdemultimedia/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libltdl3-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libltdl3-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev
 Standards-Version: 3.7.2
 
 Package: tdemultimedia
@@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release
 Package: tdemultimedia-dev
 Section: devel
 Architecture: any
-Depends: tdelibs4-dev (>= 4:3.5.8), artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
+Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
 Conflicts: libmpeg-dev
 Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0)
 Description: development files for the KDE multimedia module
diff --git a/debian/lenny/tdemultimedia/debian/rules b/debian/lenny/tdemultimedia/debian/rules
index 1696038de..336c7e70d 100755
--- a/debian/lenny/tdemultimedia/debian/rules
+++ b/debian/lenny/tdemultimedia/debian/rules
@@ -27,14 +27,6 @@ PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid
 	libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \
 	libkcddb1-trinity mpeglib-trinity noatun-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_artsbuilder-trinity			:= -V'artsbuilder-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kmid-trinity			:= -V'kmid-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libkcddb1-trinity			:= -V'libkcddb1-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_mpeglib-trinity			:= -V'mpeglib-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_noatun-trinity			:= -V'noatun-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libarts1-mpeglib-trinity		:= -V'libarts1-mpeglib-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_tdemultimedia-kio-plugins-trinity 	:= -V'tdemultimedia-kio-plugins-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/debian/lenny/tdenetwork/debian/control b/debian/lenny/tdenetwork/debian/control
index 3c92cf20a..c9d49f957 100644
--- a/debian/lenny/tdenetwork/debian/control
+++ b/debian/lenny/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
@@ -308,7 +308,7 @@ Section: devel
 Architecture: any
 Replaces: kdenetwork-trinity-dev (<< 4:14.0.0)
 Breaks: kdenetwork-trinity-dev (<< 4:14.0.0)
-Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity network module
  This is the development package which contains the headers for the KDE RSS
  library as well as the Kopete chat client, as well as miscellaneous
diff --git a/debian/lenny/tdenetwork/debian/control.in b/debian/lenny/tdenetwork/debian/control.in
index 1a1f80350..76c4eadc2 100644
--- a/debian/lenny/tdenetwork/debian/control.in
+++ b/debian/lenny/tdenetwork/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-dev, libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: tdenetwork
@@ -275,7 +275,7 @@ Description: RSS library for KDE
 Package: tdenetwork-dev
 Section: devel
 Architecture: any
-Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), tdelibs4-dev
 Replaces: librss1-dev, kdict (<< 4:3.5.0-3)
 Conflicts: librss1-dev
 Description: development files for the KDE network module
diff --git a/debian/lenny/tdenetwork/debian/rules b/debian/lenny/tdenetwork/debian/rules
index 71afe376c..419a19915 100755
--- a/debian/lenny/tdenetwork/debian/rules
+++ b/debian/lenny/tdenetwork/debian/rules
@@ -30,9 +30,6 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdenetwork-trinity-dbg
 
 PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_librss1-trinity	:= -V'librss1-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kopete-trinity	:= -V'kopete-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control
index 6967dbe4c..ce2e72016 100644
--- a/debian/lenny/tdepim/debian/control
+++ b/debian/lenny/tdepim/debian/control
@@ -116,7 +116,6 @@ Architecture: any
 Replaces: kaddressbook-trinity (<< 4:14.0.0)
 Breaks: kaddressbook-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
@@ -174,7 +173,6 @@ Section: utils
 Architecture: any
 Replaces: karm-trinity (<< 4:14.0.0)
 Breaks: karm-trinity (<< 4:14.0.0)
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Depends: ${shlibs:Depends}
 Description: Trinity time tracker tool
  KArm is a time tracker for busy people who need to keep track of the amount of
@@ -274,7 +272,6 @@ Breaks: kmail-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Provides: imap-client, mail-reader
 Description: Trinity Email client
  KMail is a fully-featured email client that fits nicely into the KDE
@@ -325,7 +322,6 @@ Replaces: knotes-trinity (<< 4:14.0.0)
 Breaks: knotes-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: tdepim-kresources-trinity
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Description: Trinity sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
@@ -389,7 +385,6 @@ Replaces: korganizer-trinity (<< 4:14.0.0)
 Breaks: korganizer-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: kghostview-trinity
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Description: Trinity personal organizer
  This package contains KOrganizer, a calendar and scheduling program.
  .
@@ -518,7 +513,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkdepim1-trinity-dev (<< 4:14.0.0)
 Breaks: libkdepim1-trinity-dev (<< 4:14.0.0)
-Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.7)
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library.
diff --git a/debian/lenny/tdepim/debian/control.in b/debian/lenny/tdepim/debian/control.in
index 88bd2e756..3b45c48d0 100644
--- a/debian/lenny/tdepim/debian/control.in
+++ b/debian/lenny/tdepim/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake1.9,
- cdparanoia, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), bison, byacc, bzip2,
+ cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
@@ -481,7 +481,7 @@ Description: KDE PIM library
 Package: libtdepim1-dev
 Section: libdevel
 Architecture: any
-Depends: libtdepim1a (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libtdepim1a (= ${Source-Version}), tdelibs4-dev
 Replaces: tdepim-dev (<< 4:3.4.1)
 Description: KDE PIM library [development]
  This is the development package which contains the headers for the libtdepim
diff --git a/debian/lenny/tdesdk/debian/control b/debian/lenny/tdesdk/debian/control
index 07760541d..16d2c2e6b 100644
--- a/debian/lenny/tdesdk/debian/control
+++ b/debian/lenny/tdesdk/debian/control
@@ -5,9 +5,9 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, tdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
- tdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
- libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev,
+ gettext, pkg-config, tdelibs4-trinity-dev, binutils-dev, bison, flex,
+ tdepim-trinity-dev, libapr1-dev, libkcal2-trinity-dev,
+ libktnef1-trinity-dev, libsvn-dev, libdb-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
@@ -73,7 +73,7 @@ Section: devel
 Replaces: kapptemplate-trinity (<< 4:14.0.0)
 Breaks: kapptemplate-trinity (<< 4:14.0.0)
 Conflicts: kapptemplate
-Recommends: automake1.9 | automaken, tdelibs4-trinity-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-trinity-dev
 Description: creates a framework to develop a Trinity application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -111,7 +111,7 @@ Architecture: any
 Section: libdevel
 Replaces: kbabel-trinity-dev (<< 4:14.0.0)
 Breaks: kbabel-trinity-dev (<< 4:14.0.0)
-Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: kbabel
 Description: PO-file editing suite for Trinity (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -282,7 +282,7 @@ Architecture: any
 Section: devel
 Replaces: kspy-trinity (<< 4:14.0.0)
 Breaks: kspy-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-trinity-dev
 Conflicts: kspy
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
@@ -340,7 +340,7 @@ Architecture: any
 Section: libdevel
 Replaces: libcvsservice-trinity-dev (<< 4:14.0.0)
 Breaks: libcvsservice-trinity-dev (<< 4:14.0.0)
-Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: libcvsservice-dev
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
diff --git a/debian/lenny/tdesdk/debian/control.in b/debian/lenny/tdesdk/debian/control.in
index 7680adce7..6aaa2bce3 100644
--- a/debian/lenny/tdesdk/debian/control.in
+++ b/debian/lenny/tdesdk/debian/control.in
@@ -5,9 +5,9 @@ Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, tdelibs4-dev (>= 4:3.5.8), binutils-dev, bison, flex,
- tdepim-dev (>= 4:3.5.8), libapr1-dev, libkcal2-dev (>= 4:3.5.8),
- libktnef1-dev (>= 4:3.5.8), libsvn-dev
+ gettext, pkg-config, tdelibs4-dev, binutils-dev, bison, flex,
+ tdepim-dev, libapr1-dev, libkcal2-dev,
+ libktnef1-dev, libsvn-dev
 Standards-Version: 3.7.2
 
 Package: tdesdk
@@ -63,7 +63,7 @@ Description: a graphical CVS front end for KDE
 Package: kapptemplate
 Architecture: all
 Section: devel
-Recommends: automake1.9 | automaken, tdelibs4-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-dev
 Description: creates a framework to develop a KDE application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -96,7 +96,7 @@ Description: PO-file editing suite for KDE
 Package: kbabel-dev
 Architecture: any
 Section: libdevel
-Depends: kbabel (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kbabel (= ${Source-Version}), tdelibs4-dev
 Replaces: kbabel (<< 4:3.0.8-0)
 Description: PO-file editing suite for KDE (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -245,7 +245,7 @@ Description: a KDE GUI for viewing differences between files
 Package: kspy
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, tdelibs4-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-dev
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
  the QObjects in use by a Qt/KDE app.  In addition to the object tree,
@@ -295,7 +295,7 @@ Description: DCOP service for accessing CVS repositories
 Package: libcvsservice-dev
 Architecture: any
 Section: libdevel
-Depends: libcvsservice0 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libcvsservice0 (= ${Source-Version}), tdelibs4-dev
 Replaces: cervisia (<< 4:3.2.0)
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
diff --git a/debian/lenny/tdesdk/debian/rules b/debian/lenny/tdesdk/debian/rules
index d63a59865..5a7eda7d0 100755
--- a/debian/lenny/tdesdk/debian/rules
+++ b/debian/lenny/tdesdk/debian/rules
@@ -18,13 +18,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 
 PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kbabel-trinity			:= -V'kbabel-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kompare-trinity			:= -V'kompare-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kspy-trinity			:= -V'kspy-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kunittest-trinity			:= -V'kunittest-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libcvsservice0-trinity		:= -V'libcvsservice0-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_umbrello-trinity			:= -V'umbrello-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/debian/lenny/tdetoys/debian/control b/debian/lenny/tdetoys/debian/control
index 747939d88..e583487ae 100644
--- a/debian/lenny/tdetoys/debian/control
+++ b/debian/lenny/tdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdetoys-trinity
diff --git a/debian/lenny/tdetoys/debian/control.in b/debian/lenny/tdetoys/debian/control.in
index d1954caad..5fb46a280 100644
--- a/debian/lenny/tdetoys/debian/control.in
+++ b/debian/lenny/tdetoys/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev, gawk, gettext, sharutils
 Standards-Version: 3.7.2
 
 Package: tdetoys
diff --git a/debian/lenny/tdeutils/debian/control b/debian/lenny/tdeutils/debian/control
index 9f2fb051c..290f65d7f 100644
--- a/debian/lenny/tdeutils/debian/control
+++ b/debian/lenny/tdeutils/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), tdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
@@ -61,7 +61,7 @@ Section: utils
 Architecture: any
 Replaces: kdeutils-trinity-dev (<< 4:14.0.0)
 Breaks: kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity utilities module
  This package contains development files needed to compile tdeutils
  applications.
@@ -202,7 +202,7 @@ Section: tde
 Architecture: any
 Replaces: kgpg-trinity (<< 4:14.0.0)
 Breaks: kgpg-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, konsole-trinity (>= 4:3.5.8), gnupg
+Depends: ${shlibs:Depends}, konsole-trinity, gnupg
 Suggests: khelpcenter-trinity
 Description: GnuPG frontend for Trinity
  Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
diff --git a/debian/lenny/tdeutils/debian/control.in b/debian/lenny/tdeutils/debian/control.in
index d8263e1cd..f1d64bd00 100644
--- a/debian/lenny/tdeutils/debian/control.in
+++ b/debian/lenny/tdeutils/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), tdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, tdebase-dev, libkonq4-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-doc
 Standards-Version: 3.7.2
 
@@ -53,7 +53,7 @@ Description: KDE utilities documentation in HTML format
 Package: tdeutils-dev
 Section: utils
 Architecture: any
-Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), tdelibs4-dev
 Description: development files for the KDE utilities module
  This package contains development files needed to compile tdeutils
  applications.
@@ -178,7 +178,7 @@ Description: floppy formatter for KDE
 Package: kgpg
 Section: tde
 Architecture: any
-Depends: ${shlibs:Depends}, konsole (>= 4:3.5.8), gnupg
+Depends: ${shlibs:Depends}, konsole, gnupg
 Suggests: khelpcenter
 Description: GnuPG frontend for KDE
  Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
diff --git a/debian/lenny/tdeutils/debian/rules b/debian/lenny/tdeutils/debian/rules
index a83c83fdf..0dfac3ab0 100755
--- a/debian/lenny/tdeutils/debian/rules
+++ b/debian/lenny/tdeutils/debian/rules
@@ -22,12 +22,6 @@ DEB_DH_STRIP_ARGS  := --exclude=examples --dbg-package=tdeutils-trinity-dbg
 
 PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_khexedit-trinity		:= -V'khexedit-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon-trinity	:= -V'klaptopdaemon-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kmilo-trinity		:= -V'kmilo-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kregexpeditor-trinity	:= -V'kregexpeditor-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksim-trinity		:= -V'ksim-trinity (>= 4:3.5.7-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/debian/lenny/tdevelop/debian/control b/debian/lenny/tdevelop/debian/control
index b5b2032d9..6203fd52d 100644
--- a/debian/lenny/tdevelop/debian/control
+++ b/debian/lenny/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev (>= 4:3.5.10), gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdevelop-trinity
diff --git a/debian/lenny/tdewebdev/debian/control b/debian/lenny/tdewebdev/debian/control
index b306cdb69..542f7f514 100644
--- a/debian/lenny/tdewebdev/debian/control
+++ b/debian/lenny/tdewebdev/debian/control
@@ -171,7 +171,7 @@ Architecture: any
 Section: libdevel
 Replaces: kommander-trinity-dev (<< 4:14.0.0)
 Breaks: kommander-trinity-dev (<< 4:14.0.0)
-Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev
 Description: development files for Kommander [Trinity]
  This package contains the headers and other development files for
  building plugins or otherwise extending Kommander.
diff --git a/debian/lenny/tdewebdev/debian/control.in b/debian/lenny/tdewebdev/debian/control.in
index cbc4129c9..aa1dcb562 100644
--- a/debian/lenny/tdewebdev/debian/control.in
+++ b/debian/lenny/tdewebdev/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libcvsservice-dev (>= 4:3.5.8), libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.7.2
 
 Package: tdewebdev
@@ -157,7 +157,7 @@ Description: visual dialog builder and executor tool
 Package: kommander-dev
 Architecture: any
 Section: libdevel
-Depends: kommander (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kommander (= ${Source-Version}), tdelibs4-dev
 Replaces: kommander (<< 1:3.3.0)
 Description: development files for Kommander
  This package contains the headers and other development files for
diff --git a/debian/lenny/tdewebdev/debian/rules b/debian/lenny/tdewebdev/debian/rules
index 888f66bcf..5a5ea2fd9 100755
--- a/debian/lenny/tdewebdev/debian/rules
+++ b/debian/lenny/tdewebdev/debian/rules
@@ -30,7 +30,5 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdewebdev-trinity-dbg
 
 PACKAGES_WITH_LIBS := kommander-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kommander-trinity := -V'kommander-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control
index 0ada041f5..9805dce74 100644
--- a/debian/squeeze/applications/amarok/debian/control
+++ b/debian/squeeze/applications/amarok/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
 Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
  tdelibs4-trinity-dev,
  libxine-dev, libdbus-tqt-1-dev,
- libtag1-dev, libsqlite3-dev, libtunepimp-dev,
+ libtag1-dev, libsqlite3-dev,
  libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
  libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev,
diff --git a/debian/squeeze/applications/basket/debian/control b/debian/squeeze/applications/basket/debian/control
index 94bc81285..00a63c8f7 100644
--- a/debian/squeeze/applications/basket/debian/control
+++ b/debian/squeeze/applications/basket/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, debhelper (>= 5), tdelibs4-trinity-dev (>= 4:3.5.6), tdepim-trinity-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, debhelper (>= 5), tdelibs4-trinity-dev, tdepim-trinity-dev, libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: basket-trinity
diff --git a/debian/squeeze/applications/koffice/debian/control b/debian/squeeze/applications/koffice/debian/control
index 447aef218..b48e508be 100644
--- a/debian/squeeze/applications/koffice/debian/control
+++ b/debian/squeeze/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
diff --git a/debian/squeeze/applications/kuickshow/debian/control b/debian/squeeze/applications/kuickshow/debian/control
index 7cc247af5..08d878123 100644
--- a/debian/squeeze/applications/kuickshow/debian/control
+++ b/debian/squeeze/applications/kuickshow/debian/control
@@ -2,7 +2,7 @@ Source: kuickshow-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev, imlib11-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kuickshow-trinity
diff --git a/debian/squeeze/applications/kuickshow/debian/control.in b/debian/squeeze/applications/kuickshow/debian/control.in
index 9154c1196..e28d93dd3 100644
--- a/debian/squeeze/applications/kuickshow/debian/control.in
+++ b/debian/squeeze/applications/kuickshow/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: kuickshow-trinity
diff --git a/debian/squeeze/applications/kvirc/debian/rules b/debian/squeeze/applications/kvirc/debian/rules
index 2ed9f4000..47b413288 100755
--- a/debian/squeeze/applications/kvirc/debian/rules
+++ b/debian/squeeze/applications/kvirc/debian/rules
@@ -82,6 +82,8 @@ common-install-indep::
 	mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/hicolor
 	mkdir -p $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons
 	mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/hicolor $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons/
+
+common-install-arch::
 	mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/lib/
 
 post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/tdeaccessibility/debian/control.in b/debian/squeeze/tdeaccessibility/debian/control.in
index 50e869602..70dea8a79 100644
--- a/debian/squeeze/tdeaccessibility/debian/control.in
+++ b/debian/squeeze/tdeaccessibility/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, tdelibs4-dev (>= 4:3.5.8), tdemultimedia-dev (>= 4:3.5.8), libakode-dev, libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, tdelibs4-dev, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
 Standards-Version: 3.7.2
 
 Package: tdeaccessibility
diff --git a/debian/squeeze/tdeaccessibility/debian/rules b/debian/squeeze/tdeaccessibility/debian/rules
index ce879ebd4..f5c6caf43 100755
--- a/debian/squeeze/tdeaccessibility/debian/rules
+++ b/debian/squeeze/tdeaccessibility/debian/rules
@@ -20,8 +20,5 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdeaccessibility-trinity-dbg
 
 PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kttsd-trinity	:= -V'kttsd-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksayit-trinity	:= -V'ksayit-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
diff --git a/debian/squeeze/tdeaddons/debian/control.in b/debian/squeeze/tdeaddons/debian/control.in
index 1a2fa68b7..86eedbb08 100644
--- a/debian/squeeze/tdeaddons/debian/control.in
+++ b/debian/squeeze/tdeaddons/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), atlantik-dev (>= 4:3.5.8), tdebase-dev (>= 4:3.5.8), tdemultimedia-dev (>= 4:3.5.8), libtdegames-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), tdepim-dev (>= 4:3.5.8), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.6++-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, atlantik-dev, tdebase-dev, tdemultimedia-dev, libtdegames-dev, libkonq4-dev, tdepim-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.6++-dev
 Standards-Version: 3.7.2
 
 Package: tdeaddons
diff --git a/debian/squeeze/tdeadmin/debian/control b/debian/squeeze/tdeadmin/debian/control
index f16fedd99..ec538087d 100644
--- a/debian/squeeze/tdeadmin/debian/control
+++ b/debian/squeeze/tdeadmin/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-trinity-dev, libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeadmin-trinity
diff --git a/debian/squeeze/tdeadmin/debian/control.in b/debian/squeeze/tdeadmin/debian/control.in
index d45089be7..59b842cd2 100644
--- a/debian/squeeze/tdeadmin/debian/control.in
+++ b/debian/squeeze/tdeadmin/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-dev (>= 4:3.5.7), libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-dev, libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
 Standards-Version: 3.7.2
 
 Package: tdeadmin
diff --git a/debian/squeeze/tdeartwork/debian/control.in b/debian/squeeze/tdeartwork/debian/control.in
index 4f600ea19..1721be0bf 100644
--- a/debian/squeeze/tdeartwork/debian/control.in
+++ b/debian/squeeze/tdeartwork/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev, gawk, gettext, sharutils, tdebase-dev, twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.7.2
 
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index 9ce7d158e..f070eb444 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
@@ -140,7 +140,7 @@ Section: devel
 Architecture: any
 Replaces: kdebase-trinity-dev (<< 4:14.0.0)
 Breaks: kdebase-trinity-dev (<< 4:14.0.0)
-Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
  compile software based on the KDE base module.
@@ -578,7 +578,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkonq4-trinity-dev (<< 4:14.0.0)
 Breaks: libkonq4-trinity-dev (<< 4:14.0.0)
-Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: libkonq-trinity-dev (<< 4:3.0.0), libkonq3-trinity (<< 4:3.0.0)
 Description: development files for Konqueror's core libraries
  This package contains headers and other development files for the core
diff --git a/debian/squeeze/tdebase/debian/control.in b/debian/squeeze/tdebase/debian/control.in
index 2c874cc69..7a229ecba 100644
--- a/debian/squeeze/tdebase/debian/control.in
+++ b/debian/squeeze/tdebase/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.7.3
@@ -121,7 +121,7 @@ Description: shared data files for the KDE base module
 Package: tdebase-dev
 Section: devel
 Architecture: any
-Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), twin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), twin (= ${Source-Version}), tdelibs4-dev
 Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
@@ -518,7 +518,7 @@ Description: core libraries for Konqueror
 Package: libkonq4-dev
 Section: libdevel
 Architecture: any
-Depends: libkonq4 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libkonq4 (= ${Source-Version}), tdelibs4-dev
 Conflicts: libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
 Replaces: tdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
 Description: development files for Konqueror's core libraries
diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules
index 49932893e..62ae28933 100755
--- a/debian/squeeze/tdebase/debian/rules
+++ b/debian/squeeze/tdebase/debian/rules
@@ -38,16 +38,6 @@ DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach ki
 PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
 			ksysguard-trinity twin-trinity libkonq4-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kate-trinity		:= -V'kate-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kcontrol-trinity		:= -V'kcontrol-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_tdebase-trinity-bin		:= -V'tdebase-trinity-bin (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kicker-trinity		:= -V'kicker-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_konqueror-trinity		:= -V'konqueror-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksplash-trinity		:= -V'ksplash-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksysguard-trinity		:= -V'ksysguard-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_twin-trinity		:= -V'twin-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libkonq4-trinity		:= -V'libkonq4-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/debian/squeeze/tdebindings/debian/control b/debian/squeeze/tdebindings/debian/control
index 55d1ec903..a60ef4874 100644
--- a/debian/squeeze/tdebindings/debian/control
+++ b/debian/squeeze/tdebindings/debian/control
@@ -2,7 +2,7 @@ Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
- tdelibs4-trinity-dev (>= 4:3.5.9), libtqt3-compat-headers (>= 3:3.3.5),
+ tdelibs4-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby1.8-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
 Section: devel
diff --git a/debian/squeeze/tdebindings/debian/control.in b/debian/squeeze/tdebindings/debian/control.in
index 998cde21d..e889fa579 100644
--- a/debian/squeeze/tdebindings/debian/control.in
+++ b/debian/squeeze/tdebindings/debian/control.in
@@ -2,7 +2,7 @@ Source: tdebindings
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
- tdelibs4-dev (>= 4:3.5.7), libgtk1.2-dev, libqt3-compat-headers (>= 3:3.3.5),
+ tdelibs4-dev, libgtk1.2-dev, libqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby1.8-dev
 Section: devel
 Priority: optional
diff --git a/debian/squeeze/tdeedu/debian/control b/debian/squeeze/tdeedu/debian/control
index b701b5e17..b400fada5 100644
--- a/debian/squeeze/tdeedu/debian/control
+++ b/debian/squeeze/tdeedu/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeedu-trinity
@@ -550,7 +550,7 @@ Architecture: any
 Section: libdevel
 Replaces: libkdeedu-trinity-dev (<< 4:14.0.0)
 Breaks: libkdeedu-trinity-dev (<< 4:14.0.0)
-Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for Trinity educational library
  The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
@@ -586,7 +586,7 @@ Architecture: any
 Section: libdevel
 Replaces: libkiten-trinity-dev (<< 4:14.0.0)
 Breaks: libkiten-trinity-dev (<< 4:14.0.0)
-Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for Kiten library
  Kiten is a Japanese reference/study tool for KDE.  The library
  libkiten contains portions of Kiten that may be useful for other
diff --git a/debian/squeeze/tdeedu/debian/control.in b/debian/squeeze/tdeedu/debian/control.in
index 28384cd2c..1e39e143a 100644
--- a/debian/squeeze/tdeedu/debian/control.in
+++ b/debian/squeeze/tdeedu/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
 Standards-Version: 3.7.2
 
 Package: tdeedu
@@ -497,7 +497,7 @@ Description: library for use with KDE educational apps
 Package: libtdeedu-dev
 Architecture: any
 Section: libdevel
-Depends: libtdeedu3 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libtdeedu3 (= ${Source-Version}), tdelibs4-dev
 Description: development files for KDE educational library
  The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
@@ -530,7 +530,7 @@ Description: library for Kiten Japanese reference/study tool
 Package: libkiten-dev
 Architecture: any
 Section: libdevel
-Depends: libkiten1 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libkiten1 (= ${Source-Version}), tdelibs4-dev
 Description: development files for Kiten library
  Kiten is a Japanese reference/study tool for KDE.  The library
  libkiten contains portions of Kiten that may be useful for other
diff --git a/debian/squeeze/tdeedu/debian/rules b/debian/squeeze/tdeedu/debian/rules
index 2c6198c42..d1258cdf0 100755
--- a/debian/squeeze/tdeedu/debian/rules
+++ b/debian/squeeze/tdeedu/debian/rules
@@ -49,7 +49,7 @@ DEB_INSTALL_DOCS_ALL :=
 
 DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
 
-DEB_DH_MAKESHLIBS_ARGS_libtdeedu3-trinity := -V'libtdeedu3-trinity (>= 4:3.5.8)'
-DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity (>= 4:3.5.8)'
+DEB_DH_MAKESHLIBS_ARGS_libtdeedu3-trinity := -V'libtdeedu3-trinity'
+DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity'
 
 PACKAGES_WITH_LIBS := libtdeedu3-trinity libkiten1-trinity kvoctrain-trinity
diff --git a/debian/squeeze/tdegames/debian/control b/debian/squeeze/tdegames/debian/control
index 42e2c7e39..9a34a3f46 100644
--- a/debian/squeeze/tdegames/debian/control
+++ b/debian/squeeze/tdegames/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
@@ -76,7 +76,7 @@ Architecture: any
 Section: libdevel
 Replaces: libkdegames-trinity-dev (<< 4:14.0.0)
 Breaks: libkdegames-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev (>= 4:3.5.1), libtdegames1-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, libtdegames1-trinity (= ${Source-Version})
 Description: Trinity games library headers
  This package is necessary if you want to develop your own games using
  the KDE games library.
diff --git a/debian/squeeze/tdegames/debian/control.in b/debian/squeeze/tdegames/debian/control.in
index f1f898320..e4d234b34 100644
--- a/debian/squeeze/tdegames/debian/control.in
+++ b/debian/squeeze/tdegames/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, tdelibs4-doc
 Standards-Version: 3.7.2
 
@@ -66,7 +66,7 @@ Description: debugging symbols for tdegames
 Package: libtdegames-dev
 Architecture: any
 Section: libdevel
-Depends: tdelibs4-dev (>= 4:3.5.1), libtdegames1 (= ${Source-Version})
+Depends: tdelibs4-dev, libtdegames1 (= ${Source-Version})
 Description: KDE games library headers
  This package is necessary if you want to develop your own games using
  the KDE games library.
diff --git a/debian/squeeze/tdegames/debian/rules b/debian/squeeze/tdegames/debian/rules
index 15b61b8c0..a979e0440 100755
--- a/debian/squeeze/tdegames/debian/rules
+++ b/debian/squeeze/tdegames/debian/rules
@@ -26,7 +26,7 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if
 
 DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog
 
-DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity (>= 4:3.5.8)'
+DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity'
 DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V
 DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V
 
diff --git a/debian/squeeze/tdegraphics/debian/control b/debian/squeeze/tdegraphics/debian/control
index fa0f2c8f9..f9d000509 100644
--- a/debian/squeeze/tdegraphics/debian/control
+++ b/debian/squeeze/tdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdegraphics-trinity
@@ -76,7 +76,7 @@ Section: devel
 Architecture: any
 Replaces: kdegraphics-trinity-dev (<< 4:14.0.0)
 Breaks: kdegraphics-trinity-dev (<< 4:14.0.0)
-Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs4-trinity-dev
 Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
@@ -376,7 +376,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkscan-trinity-dev (<< 4:14.0.0)
 Breaks: libkscan-trinity-dev (<< 4:14.0.0)
-Depends: libkscan1-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkscan1-trinity (= ${binary:Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
  .
diff --git a/debian/squeeze/tdegraphics/debian/control.in b/debian/squeeze/tdegraphics/debian/control.in
index 678200a9a..f84b69851 100644
--- a/debian/squeeze/tdegraphics/debian/control.in
+++ b/debian/squeeze/tdegraphics/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, tdelibs4-dev (>= 4:3.5.6), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, tdelibs4-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
 Package: tdegraphics
@@ -66,7 +66,7 @@ Description: a color palette editor and color picker for KDE
 Package: tdegraphics-dev
 Section: devel
 Architecture: any
-Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), tdelibs4-dev
 Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
@@ -350,7 +350,7 @@ Description: generic framework for viewer applications in KDE
 Package: libkscan-dev
 Section: libdevel
 Architecture: any
-Depends: libkscan1 (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libkscan1 (= ${binary:Version}), tdelibs4-dev
 Description: development files for the KDE scanner library
  This package contains development files for KDE's scanner library.
  .
diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index 6e306e4bf..b81a9614a 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,
diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules
index 2e2bdf3ee..a88ed600f 100755
--- a/debian/squeeze/tdelibs/debian/rules
+++ b/debian/squeeze/tdelibs/debian/rules
@@ -35,8 +35,6 @@ DEB_FIXPERMS_EXCLUDE := \
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdelibs-trinity-dbg
 
-DEB_DH_MAKESHLIBS_ARGS_tdelibs4c2a-trinity := -V'tdelibs4c2a-trinity (>= 4:3.5.8-1)'
-
 binary-install/tdelibs-data-trinity::
 	install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
 	install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
diff --git a/debian/squeeze/tdemultimedia/debian/control b/debian/squeeze/tdemultimedia/debian/control
index 4cf40192e..71e6c32f4 100644
--- a/debian/squeeze/tdemultimedia/debian/control
+++ b/debian/squeeze/tdemultimedia/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdemultimedia-trinity
@@ -31,7 +31,7 @@ Section: devel
 Architecture: any
 Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev (>= 4:3.5.7), artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
 Conflicts: libmpeg-trinity-dev
 Description: development files for the Trinity multimedia module
  Development files and headers for the Trinity multimedia module.
diff --git a/debian/squeeze/tdemultimedia/debian/control.in b/debian/squeeze/tdemultimedia/debian/control.in
index 7487b21fb..7b20cca6d 100644
--- a/debian/squeeze/tdemultimedia/debian/control.in
+++ b/debian/squeeze/tdemultimedia/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libltdl3-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libltdl3-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev
 Standards-Version: 3.7.2
 
 Package: tdemultimedia
@@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release
 Package: tdemultimedia-dev
 Section: devel
 Architecture: any
-Depends: tdelibs4-dev (>= 4:3.5.8), artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
+Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
 Conflicts: libmpeg-dev
 Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0)
 Description: development files for the KDE multimedia module
diff --git a/debian/squeeze/tdemultimedia/debian/rules b/debian/squeeze/tdemultimedia/debian/rules
index 1696038de..336c7e70d 100755
--- a/debian/squeeze/tdemultimedia/debian/rules
+++ b/debian/squeeze/tdemultimedia/debian/rules
@@ -27,14 +27,6 @@ PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid
 	libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \
 	libkcddb1-trinity mpeglib-trinity noatun-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_artsbuilder-trinity			:= -V'artsbuilder-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kmid-trinity			:= -V'kmid-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libkcddb1-trinity			:= -V'libkcddb1-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_mpeglib-trinity			:= -V'mpeglib-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_noatun-trinity			:= -V'noatun-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libarts1-mpeglib-trinity		:= -V'libarts1-mpeglib-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_tdemultimedia-kio-plugins-trinity 	:= -V'tdemultimedia-kio-plugins-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/debian/squeeze/tdenetwork/debian/control b/debian/squeeze/tdenetwork/debian/control
index 3c92cf20a..c9d49f957 100644
--- a/debian/squeeze/tdenetwork/debian/control
+++ b/debian/squeeze/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
@@ -308,7 +308,7 @@ Section: devel
 Architecture: any
 Replaces: kdenetwork-trinity-dev (<< 4:14.0.0)
 Breaks: kdenetwork-trinity-dev (<< 4:14.0.0)
-Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity network module
  This is the development package which contains the headers for the KDE RSS
  library as well as the Kopete chat client, as well as miscellaneous
diff --git a/debian/squeeze/tdenetwork/debian/control.in b/debian/squeeze/tdenetwork/debian/control.in
index 1a1f80350..76c4eadc2 100644
--- a/debian/squeeze/tdenetwork/debian/control.in
+++ b/debian/squeeze/tdenetwork/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-dev, libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: tdenetwork
@@ -275,7 +275,7 @@ Description: RSS library for KDE
 Package: tdenetwork-dev
 Section: devel
 Architecture: any
-Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), tdelibs4-dev
 Replaces: librss1-dev, kdict (<< 4:3.5.0-3)
 Conflicts: librss1-dev
 Description: development files for the KDE network module
diff --git a/debian/squeeze/tdenetwork/debian/rules b/debian/squeeze/tdenetwork/debian/rules
index 71afe376c..419a19915 100755
--- a/debian/squeeze/tdenetwork/debian/rules
+++ b/debian/squeeze/tdenetwork/debian/rules
@@ -30,9 +30,6 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdenetwork-trinity-dbg
 
 PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_librss1-trinity	:= -V'librss1-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kopete-trinity	:= -V'kopete-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control
index 6967dbe4c..ce2e72016 100644
--- a/debian/squeeze/tdepim/debian/control
+++ b/debian/squeeze/tdepim/debian/control
@@ -116,7 +116,6 @@ Architecture: any
 Replaces: kaddressbook-trinity (<< 4:14.0.0)
 Breaks: kaddressbook-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
@@ -174,7 +173,6 @@ Section: utils
 Architecture: any
 Replaces: karm-trinity (<< 4:14.0.0)
 Breaks: karm-trinity (<< 4:14.0.0)
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Depends: ${shlibs:Depends}
 Description: Trinity time tracker tool
  KArm is a time tracker for busy people who need to keep track of the amount of
@@ -274,7 +272,6 @@ Breaks: kmail-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Provides: imap-client, mail-reader
 Description: Trinity Email client
  KMail is a fully-featured email client that fits nicely into the KDE
@@ -325,7 +322,6 @@ Replaces: knotes-trinity (<< 4:14.0.0)
 Breaks: knotes-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: tdepim-kresources-trinity
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Description: Trinity sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
@@ -389,7 +385,6 @@ Replaces: korganizer-trinity (<< 4:14.0.0)
 Breaks: korganizer-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: kghostview-trinity
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Description: Trinity personal organizer
  This package contains KOrganizer, a calendar and scheduling program.
  .
@@ -518,7 +513,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkdepim1-trinity-dev (<< 4:14.0.0)
 Breaks: libkdepim1-trinity-dev (<< 4:14.0.0)
-Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.7)
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library.
diff --git a/debian/squeeze/tdepim/debian/control.in b/debian/squeeze/tdepim/debian/control.in
index 88bd2e756..3b45c48d0 100644
--- a/debian/squeeze/tdepim/debian/control.in
+++ b/debian/squeeze/tdepim/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake1.9,
- cdparanoia, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), bison, byacc, bzip2,
+ cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
@@ -481,7 +481,7 @@ Description: KDE PIM library
 Package: libtdepim1-dev
 Section: libdevel
 Architecture: any
-Depends: libtdepim1a (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libtdepim1a (= ${Source-Version}), tdelibs4-dev
 Replaces: tdepim-dev (<< 4:3.4.1)
 Description: KDE PIM library [development]
  This is the development package which contains the headers for the libtdepim
diff --git a/debian/squeeze/tdesdk/debian/control b/debian/squeeze/tdesdk/debian/control
index 07760541d..16d2c2e6b 100644
--- a/debian/squeeze/tdesdk/debian/control
+++ b/debian/squeeze/tdesdk/debian/control
@@ -5,9 +5,9 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, tdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
- tdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
- libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev,
+ gettext, pkg-config, tdelibs4-trinity-dev, binutils-dev, bison, flex,
+ tdepim-trinity-dev, libapr1-dev, libkcal2-trinity-dev,
+ libktnef1-trinity-dev, libsvn-dev, libdb-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
@@ -73,7 +73,7 @@ Section: devel
 Replaces: kapptemplate-trinity (<< 4:14.0.0)
 Breaks: kapptemplate-trinity (<< 4:14.0.0)
 Conflicts: kapptemplate
-Recommends: automake1.9 | automaken, tdelibs4-trinity-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-trinity-dev
 Description: creates a framework to develop a Trinity application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -111,7 +111,7 @@ Architecture: any
 Section: libdevel
 Replaces: kbabel-trinity-dev (<< 4:14.0.0)
 Breaks: kbabel-trinity-dev (<< 4:14.0.0)
-Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: kbabel
 Description: PO-file editing suite for Trinity (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -282,7 +282,7 @@ Architecture: any
 Section: devel
 Replaces: kspy-trinity (<< 4:14.0.0)
 Breaks: kspy-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-trinity-dev
 Conflicts: kspy
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
@@ -340,7 +340,7 @@ Architecture: any
 Section: libdevel
 Replaces: libcvsservice-trinity-dev (<< 4:14.0.0)
 Breaks: libcvsservice-trinity-dev (<< 4:14.0.0)
-Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: libcvsservice-dev
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
diff --git a/debian/squeeze/tdesdk/debian/control.in b/debian/squeeze/tdesdk/debian/control.in
index 7680adce7..6aaa2bce3 100644
--- a/debian/squeeze/tdesdk/debian/control.in
+++ b/debian/squeeze/tdesdk/debian/control.in
@@ -5,9 +5,9 @@ Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, tdelibs4-dev (>= 4:3.5.8), binutils-dev, bison, flex,
- tdepim-dev (>= 4:3.5.8), libapr1-dev, libkcal2-dev (>= 4:3.5.8),
- libktnef1-dev (>= 4:3.5.8), libsvn-dev
+ gettext, pkg-config, tdelibs4-dev, binutils-dev, bison, flex,
+ tdepim-dev, libapr1-dev, libkcal2-dev,
+ libktnef1-dev, libsvn-dev
 Standards-Version: 3.7.2
 
 Package: tdesdk
@@ -63,7 +63,7 @@ Description: a graphical CVS front end for KDE
 Package: kapptemplate
 Architecture: all
 Section: devel
-Recommends: automake1.9 | automaken, tdelibs4-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-dev
 Description: creates a framework to develop a KDE application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -96,7 +96,7 @@ Description: PO-file editing suite for KDE
 Package: kbabel-dev
 Architecture: any
 Section: libdevel
-Depends: kbabel (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kbabel (= ${Source-Version}), tdelibs4-dev
 Replaces: kbabel (<< 4:3.0.8-0)
 Description: PO-file editing suite for KDE (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -245,7 +245,7 @@ Description: a KDE GUI for viewing differences between files
 Package: kspy
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, tdelibs4-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-dev
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
  the QObjects in use by a Qt/KDE app.  In addition to the object tree,
@@ -295,7 +295,7 @@ Description: DCOP service for accessing CVS repositories
 Package: libcvsservice-dev
 Architecture: any
 Section: libdevel
-Depends: libcvsservice0 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libcvsservice0 (= ${Source-Version}), tdelibs4-dev
 Replaces: cervisia (<< 4:3.2.0)
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
diff --git a/debian/squeeze/tdesdk/debian/rules b/debian/squeeze/tdesdk/debian/rules
index d63a59865..5a7eda7d0 100755
--- a/debian/squeeze/tdesdk/debian/rules
+++ b/debian/squeeze/tdesdk/debian/rules
@@ -18,13 +18,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 
 PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kbabel-trinity			:= -V'kbabel-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kompare-trinity			:= -V'kompare-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kspy-trinity			:= -V'kspy-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kunittest-trinity			:= -V'kunittest-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libcvsservice0-trinity		:= -V'libcvsservice0-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_umbrello-trinity			:= -V'umbrello-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/debian/squeeze/tdetoys/debian/control b/debian/squeeze/tdetoys/debian/control
index 747939d88..e583487ae 100644
--- a/debian/squeeze/tdetoys/debian/control
+++ b/debian/squeeze/tdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdetoys-trinity
diff --git a/debian/squeeze/tdetoys/debian/control.in b/debian/squeeze/tdetoys/debian/control.in
index d1954caad..5fb46a280 100644
--- a/debian/squeeze/tdetoys/debian/control.in
+++ b/debian/squeeze/tdetoys/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev, gawk, gettext, sharutils
 Standards-Version: 3.7.2
 
 Package: tdetoys
diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control
index 9f2fb051c..290f65d7f 100644
--- a/debian/squeeze/tdeutils/debian/control
+++ b/debian/squeeze/tdeutils/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), tdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
@@ -61,7 +61,7 @@ Section: utils
 Architecture: any
 Replaces: kdeutils-trinity-dev (<< 4:14.0.0)
 Breaks: kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity utilities module
  This package contains development files needed to compile tdeutils
  applications.
@@ -202,7 +202,7 @@ Section: tde
 Architecture: any
 Replaces: kgpg-trinity (<< 4:14.0.0)
 Breaks: kgpg-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, konsole-trinity (>= 4:3.5.8), gnupg
+Depends: ${shlibs:Depends}, konsole-trinity, gnupg
 Suggests: khelpcenter-trinity
 Description: GnuPG frontend for Trinity
  Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
diff --git a/debian/squeeze/tdeutils/debian/control.in b/debian/squeeze/tdeutils/debian/control.in
index d8263e1cd..f1d64bd00 100644
--- a/debian/squeeze/tdeutils/debian/control.in
+++ b/debian/squeeze/tdeutils/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), tdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, tdebase-dev, libkonq4-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-doc
 Standards-Version: 3.7.2
 
@@ -53,7 +53,7 @@ Description: KDE utilities documentation in HTML format
 Package: tdeutils-dev
 Section: utils
 Architecture: any
-Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), tdelibs4-dev
 Description: development files for the KDE utilities module
  This package contains development files needed to compile tdeutils
  applications.
@@ -178,7 +178,7 @@ Description: floppy formatter for KDE
 Package: kgpg
 Section: tde
 Architecture: any
-Depends: ${shlibs:Depends}, konsole (>= 4:3.5.8), gnupg
+Depends: ${shlibs:Depends}, konsole, gnupg
 Suggests: khelpcenter
 Description: GnuPG frontend for KDE
  Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
diff --git a/debian/squeeze/tdeutils/debian/rules b/debian/squeeze/tdeutils/debian/rules
index a83c83fdf..0dfac3ab0 100755
--- a/debian/squeeze/tdeutils/debian/rules
+++ b/debian/squeeze/tdeutils/debian/rules
@@ -22,12 +22,6 @@ DEB_DH_STRIP_ARGS  := --exclude=examples --dbg-package=tdeutils-trinity-dbg
 
 PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_khexedit-trinity		:= -V'khexedit-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon-trinity	:= -V'klaptopdaemon-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kmilo-trinity		:= -V'kmilo-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kregexpeditor-trinity	:= -V'kregexpeditor-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksim-trinity		:= -V'ksim-trinity (>= 4:3.5.7-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/debian/squeeze/tdevelop/debian/control b/debian/squeeze/tdevelop/debian/control
index b5b2032d9..6203fd52d 100644
--- a/debian/squeeze/tdevelop/debian/control
+++ b/debian/squeeze/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev (>= 4:3.5.10), gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdevelop-trinity
diff --git a/debian/squeeze/tdewebdev/debian/control b/debian/squeeze/tdewebdev/debian/control
index b306cdb69..542f7f514 100644
--- a/debian/squeeze/tdewebdev/debian/control
+++ b/debian/squeeze/tdewebdev/debian/control
@@ -171,7 +171,7 @@ Architecture: any
 Section: libdevel
 Replaces: kommander-trinity-dev (<< 4:14.0.0)
 Breaks: kommander-trinity-dev (<< 4:14.0.0)
-Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev
 Description: development files for Kommander [Trinity]
  This package contains the headers and other development files for
  building plugins or otherwise extending Kommander.
diff --git a/debian/squeeze/tdewebdev/debian/control.in b/debian/squeeze/tdewebdev/debian/control.in
index cbc4129c9..aa1dcb562 100644
--- a/debian/squeeze/tdewebdev/debian/control.in
+++ b/debian/squeeze/tdewebdev/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libcvsservice-dev (>= 4:3.5.8), libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.7.2
 
 Package: tdewebdev
@@ -157,7 +157,7 @@ Description: visual dialog builder and executor tool
 Package: kommander-dev
 Architecture: any
 Section: libdevel
-Depends: kommander (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kommander (= ${Source-Version}), tdelibs4-dev
 Replaces: kommander (<< 1:3.3.0)
 Description: development files for Kommander
  This package contains the headers and other development files for
diff --git a/debian/squeeze/tdewebdev/debian/rules b/debian/squeeze/tdewebdev/debian/rules
index 888f66bcf..5a5ea2fd9 100755
--- a/debian/squeeze/tdewebdev/debian/rules
+++ b/debian/squeeze/tdewebdev/debian/rules
@@ -30,7 +30,5 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdewebdev-trinity-dbg
 
 PACKAGES_WITH_LIBS := kommander-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kommander-trinity := -V'kommander-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control
index 0ada041f5..9805dce74 100644
--- a/ubuntu/maverick/applications/amarok/debian/control
+++ b/ubuntu/maverick/applications/amarok/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
 Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
  tdelibs4-trinity-dev,
  libxine-dev, libdbus-tqt-1-dev,
- libtag1-dev, libsqlite3-dev, libtunepimp-dev,
+ libtag1-dev, libsqlite3-dev,
  libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
  libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev,
diff --git a/ubuntu/maverick/applications/basket/debian/control b/ubuntu/maverick/applications/basket/debian/control
index 614cbece7..b78289774 100644
--- a/ubuntu/maverick/applications/basket/debian/control
+++ b/ubuntu/maverick/applications/basket/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, debhelper (>= 5), tdelibs4-trinity-dev (>= 4:3.5.6), tdepim-trinity-dev (>= 4:3.5.6), libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, debhelper (>= 5), tdelibs4-trinity-dev, tdepim-trinity-dev, libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: basket-trinity
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control
index 447aef218..b48e508be 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/maverick/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
diff --git a/ubuntu/maverick/applications/kuickshow/debian/control b/ubuntu/maverick/applications/kuickshow/debian/control
index 7cc247af5..08d878123 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/control
+++ b/ubuntu/maverick/applications/kuickshow/debian/control
@@ -2,7 +2,7 @@ Source: kuickshow-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev, imlib11-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kuickshow-trinity
diff --git a/ubuntu/maverick/applications/kuickshow/debian/control.in b/ubuntu/maverick/applications/kuickshow/debian/control.in
index 9154c1196..e28d93dd3 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/control.in
+++ b/ubuntu/maverick/applications/kuickshow/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev (>= 4:3.5.6), imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs4-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: kuickshow-trinity
diff --git a/ubuntu/maverick/applications/kvirc/debian/rules b/ubuntu/maverick/applications/kvirc/debian/rules
index 2ed9f4000..47b413288 100755
--- a/ubuntu/maverick/applications/kvirc/debian/rules
+++ b/ubuntu/maverick/applications/kvirc/debian/rules
@@ -82,6 +82,8 @@ common-install-indep::
 	mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/hicolor
 	mkdir -p $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons
 	mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/hicolor $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons/
+
+common-install-arch::
 	mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/lib/
 
 post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/control b/ubuntu/maverick/kdegraphics.automake/debian/control
index 21d016032..9b2fe98a7 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/control
+++ b/ubuntu/maverick/kdegraphics.automake/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], automake, autoconf, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdegraphics-trinity
@@ -76,7 +76,7 @@ Section: devel
 Architecture: any
 Replaces: kdegraphics-trinity-dev (<< 4:14.0.0)
 Breaks: kdegraphics-trinity-dev (<< 4:14.0.0)
-Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), kdelibs4-trinity-dev
 Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
@@ -376,7 +376,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkscan-trinity-dev (<< 4:14.0.0)
 Breaks: libkscan-trinity-dev (<< 4:14.0.0)
-Depends: libkscan1-trinity (= ${binary:Version}), kdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkscan1-trinity (= ${binary:Version}), kdelibs4-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
  .
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/control.in b/ubuntu/maverick/kdegraphics.automake/debian/control.in
index a578b8162..af6d981bb 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/control.in
+++ b/ubuntu/maverick/kdegraphics.automake/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.6), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
 Package: kdegraphics
@@ -66,7 +66,7 @@ Description: a color palette editor and color picker for KDE
 Package: kdegraphics-dev
 Section: devel
 Architecture: any
-Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), kdelibs4-dev
 Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
@@ -350,7 +350,7 @@ Description: generic framework for viewer applications in KDE
 Package: libkscan-dev
 Section: libdevel
 Architecture: any
-Depends: libkscan1 (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libkscan1 (= ${binary:Version}), kdelibs4-dev
 Description: development files for the KDE scanner library
  This package contains development files for KDE's scanner library.
  .
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/control b/ubuntu/maverick/kdevelop.cmake/debian/control
index 3bc338552..31c2a1e37 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/control
+++ b/ubuntu/maverick/kdevelop.cmake/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), qt3-apps-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, cmake, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), qt3-apps-dev, kdelibs4-trinity-dev, gettext, kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdevelop-trinity
diff --git a/ubuntu/maverick/tdeaccessibility/debian/control.in b/ubuntu/maverick/tdeaccessibility/debian/control.in
index 50e869602..70dea8a79 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/control.in
+++ b/ubuntu/maverick/tdeaccessibility/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, tdelibs4-dev (>= 4:3.5.8), tdemultimedia-dev (>= 4:3.5.8), libakode-dev, libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, tdelibs4-dev, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
 Standards-Version: 3.7.2
 
 Package: tdeaccessibility
diff --git a/ubuntu/maverick/tdeaccessibility/debian/rules b/ubuntu/maverick/tdeaccessibility/debian/rules
index ce879ebd4..f5c6caf43 100755
--- a/ubuntu/maverick/tdeaccessibility/debian/rules
+++ b/ubuntu/maverick/tdeaccessibility/debian/rules
@@ -20,8 +20,5 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdeaccessibility-trinity-dbg
 
 PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kttsd-trinity	:= -V'kttsd-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksayit-trinity	:= -V'ksayit-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
diff --git a/ubuntu/maverick/tdeaddons/debian/control.in b/ubuntu/maverick/tdeaddons/debian/control.in
index 1a2fa68b7..86eedbb08 100644
--- a/ubuntu/maverick/tdeaddons/debian/control.in
+++ b/ubuntu/maverick/tdeaddons/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), atlantik-dev (>= 4:3.5.8), tdebase-dev (>= 4:3.5.8), tdemultimedia-dev (>= 4:3.5.8), libtdegames-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), tdepim-dev (>= 4:3.5.8), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.6++-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, atlantik-dev, tdebase-dev, tdemultimedia-dev, libtdegames-dev, libkonq4-dev, tdepim-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, libdb4.6++-dev
 Standards-Version: 3.7.2
 
 Package: tdeaddons
diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/maverick/tdeadmin/debian/control
index f16fedd99..ec538087d 100644
--- a/ubuntu/maverick/tdeadmin/debian/control
+++ b/ubuntu/maverick/tdeadmin/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-trinity-dev, libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeadmin-trinity
diff --git a/ubuntu/maverick/tdeadmin/debian/control.in b/ubuntu/maverick/tdeadmin/debian/control.in
index d45089be7..59b842cd2 100644
--- a/ubuntu/maverick/tdeadmin/debian/control.in
+++ b/ubuntu/maverick/tdeadmin/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-dev (>= 4:3.5.7), libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs4-dev, libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
 Standards-Version: 3.7.2
 
 Package: tdeadmin
diff --git a/ubuntu/maverick/tdeartwork/debian/control.in b/ubuntu/maverick/tdeartwork/debian/control.in
index 4f600ea19..1721be0bf 100644
--- a/ubuntu/maverick/tdeartwork/debian/control.in
+++ b/ubuntu/maverick/tdeartwork/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev, gawk, gettext, sharutils, tdebase-dev, twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.7.2
 
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 51c1cd832..79e0b3bcc 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
@@ -140,7 +140,7 @@ Section: devel
 Architecture: any
 Replaces: kdebase-trinity-dev (<< 4:14.0.0)
 Breaks: kdebase-trinity-dev (<< 4:14.0.0)
-Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
  compile software based on the KDE base module.
@@ -578,7 +578,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkonq4-trinity-dev (<< 4:14.0.0)
 Breaks: libkonq4-trinity-dev (<< 4:14.0.0)
-Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: libkonq-trinity-dev (<< 4:3.0.0), libkonq3-trinity (<< 4:3.0.0)
 Description: development files for Konqueror's core libraries
  This package contains headers and other development files for the core
diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in
index 2c874cc69..7a229ecba 100644
--- a/ubuntu/maverick/tdebase/debian/control.in
+++ b/ubuntu/maverick/tdebase/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.7.3
@@ -121,7 +121,7 @@ Description: shared data files for the KDE base module
 Package: tdebase-dev
 Section: devel
 Architecture: any
-Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), twin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), twin (= ${Source-Version}), tdelibs4-dev
 Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: development files for the KDE base module
  This package contains headers and other development files needed to
@@ -518,7 +518,7 @@ Description: core libraries for Konqueror
 Package: libkonq4-dev
 Section: libdevel
 Architecture: any
-Depends: libkonq4 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libkonq4 (= ${Source-Version}), tdelibs4-dev
 Conflicts: libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
 Replaces: tdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
 Description: development files for Konqueror's core libraries
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index cd629b81c..cef61b0b8 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -38,16 +38,6 @@ DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach ki
 PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
 			ksysguard-trinity twin-trinity libkonq4-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kate-trinity		:= -V'kate-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kcontrol-trinity		:= -V'kcontrol-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_tdebase-trinity-bin		:= -V'tdebase-trinity-bin (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kicker-trinity		:= -V'kicker-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_konqueror-trinity		:= -V'konqueror-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksplash-trinity		:= -V'ksplash-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksysguard-trinity		:= -V'ksysguard-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_twin-trinity		:= -V'twin-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libkonq4-trinity		:= -V'libkonq4-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control
index 55d1ec903..a60ef4874 100644
--- a/ubuntu/maverick/tdebindings/debian/control
+++ b/ubuntu/maverick/tdebindings/debian/control
@@ -2,7 +2,7 @@ Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
- tdelibs4-trinity-dev (>= 4:3.5.9), libtqt3-compat-headers (>= 3:3.3.5),
+ tdelibs4-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby1.8-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
 Section: devel
diff --git a/ubuntu/maverick/tdebindings/debian/control.in b/ubuntu/maverick/tdebindings/debian/control.in
index 998cde21d..e889fa579 100644
--- a/ubuntu/maverick/tdebindings/debian/control.in
+++ b/ubuntu/maverick/tdebindings/debian/control.in
@@ -2,7 +2,7 @@ Source: tdebindings
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk,
  gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
- tdelibs4-dev (>= 4:3.5.7), libgtk1.2-dev, libqt3-compat-headers (>= 3:3.3.5),
+ tdelibs4-dev, libgtk1.2-dev, libqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby1.8-dev
 Section: devel
 Priority: optional
diff --git a/ubuntu/maverick/tdeedu/debian/control b/ubuntu/maverick/tdeedu/debian/control
index b701b5e17..b400fada5 100644
--- a/ubuntu/maverick/tdeedu/debian/control
+++ b/ubuntu/maverick/tdeedu/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeedu-trinity
@@ -550,7 +550,7 @@ Architecture: any
 Section: libdevel
 Replaces: libkdeedu-trinity-dev (<< 4:14.0.0)
 Breaks: libkdeedu-trinity-dev (<< 4:14.0.0)
-Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libtdeedu3-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for Trinity educational library
  The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
@@ -586,7 +586,7 @@ Architecture: any
 Section: libdevel
 Replaces: libkiten-trinity-dev (<< 4:14.0.0)
 Breaks: libkiten-trinity-dev (<< 4:14.0.0)
-Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkiten1-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for Kiten library
  Kiten is a Japanese reference/study tool for KDE.  The library
  libkiten contains portions of Kiten that may be useful for other
diff --git a/ubuntu/maverick/tdeedu/debian/control.in b/ubuntu/maverick/tdeedu/debian/control.in
index 28384cd2c..1e39e143a 100644
--- a/ubuntu/maverick/tdeedu/debian/control.in
+++ b/ubuntu/maverick/tdeedu/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libboost-python-dev (>= 1.33.1), libfacile-ocaml-dev [alpha amd64 arm hppa i386 ia64 powerpc sparc], libusb-dev, sharutils, doxygen
 Standards-Version: 3.7.2
 
 Package: tdeedu
@@ -497,7 +497,7 @@ Description: library for use with KDE educational apps
 Package: libtdeedu-dev
 Architecture: any
 Section: libdevel
-Depends: libtdeedu3 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libtdeedu3 (= ${Source-Version}), tdelibs4-dev
 Description: development files for KDE educational library
  The KDE-based library libtdeedu is used with educational
  applications.  It currently provides support for data plotting and
@@ -530,7 +530,7 @@ Description: library for Kiten Japanese reference/study tool
 Package: libkiten-dev
 Architecture: any
 Section: libdevel
-Depends: libkiten1 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libkiten1 (= ${Source-Version}), tdelibs4-dev
 Description: development files for Kiten library
  Kiten is a Japanese reference/study tool for KDE.  The library
  libkiten contains portions of Kiten that may be useful for other
diff --git a/ubuntu/maverick/tdeedu/debian/rules b/ubuntu/maverick/tdeedu/debian/rules
index 2c6198c42..d1258cdf0 100755
--- a/ubuntu/maverick/tdeedu/debian/rules
+++ b/ubuntu/maverick/tdeedu/debian/rules
@@ -49,7 +49,7 @@ DEB_INSTALL_DOCS_ALL :=
 
 DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
 
-DEB_DH_MAKESHLIBS_ARGS_libtdeedu3-trinity := -V'libtdeedu3-trinity (>= 4:3.5.8)'
-DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity (>= 4:3.5.8)'
+DEB_DH_MAKESHLIBS_ARGS_libtdeedu3-trinity := -V'libtdeedu3-trinity'
+DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity'
 
 PACKAGES_WITH_LIBS := libtdeedu3-trinity libkiten1-trinity kvoctrain-trinity
diff --git a/ubuntu/maverick/tdegames/debian/control b/ubuntu/maverick/tdegames/debian/control
index 42e2c7e39..9a34a3f46 100644
--- a/ubuntu/maverick/tdegames/debian/control
+++ b/ubuntu/maverick/tdegames/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
@@ -76,7 +76,7 @@ Architecture: any
 Section: libdevel
 Replaces: libkdegames-trinity-dev (<< 4:14.0.0)
 Breaks: libkdegames-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev (>= 4:3.5.1), libtdegames1-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, libtdegames1-trinity (= ${Source-Version})
 Description: Trinity games library headers
  This package is necessary if you want to develop your own games using
  the KDE games library.
diff --git a/ubuntu/maverick/tdegames/debian/control.in b/ubuntu/maverick/tdegames/debian/control.in
index f1f898320..e4d234b34 100644
--- a/ubuntu/maverick/tdegames/debian/control.in
+++ b/ubuntu/maverick/tdegames/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, tdelibs4-doc
 Standards-Version: 3.7.2
 
@@ -66,7 +66,7 @@ Description: debugging symbols for tdegames
 Package: libtdegames-dev
 Architecture: any
 Section: libdevel
-Depends: tdelibs4-dev (>= 4:3.5.1), libtdegames1 (= ${Source-Version})
+Depends: tdelibs4-dev, libtdegames1 (= ${Source-Version})
 Description: KDE games library headers
  This package is necessary if you want to develop your own games using
  the KDE games library.
diff --git a/ubuntu/maverick/tdegames/debian/rules b/ubuntu/maverick/tdegames/debian/rules
index 15b61b8c0..a979e0440 100755
--- a/ubuntu/maverick/tdegames/debian/rules
+++ b/ubuntu/maverick/tdegames/debian/rules
@@ -26,7 +26,7 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if
 
 DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog
 
-DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity (>= 4:3.5.8)'
+DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity'
 DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V
 DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V
 
diff --git a/ubuntu/maverick/tdegraphics/debian/control b/ubuntu/maverick/tdegraphics/debian/control
index fa0f2c8f9..f9d000509 100644
--- a/ubuntu/maverick/tdegraphics/debian/control
+++ b/ubuntu/maverick/tdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdegraphics-trinity
@@ -76,7 +76,7 @@ Section: devel
 Architecture: any
 Replaces: kdegraphics-trinity-dev (<< 4:14.0.0)
 Breaks: kdegraphics-trinity-dev (<< 4:14.0.0)
-Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs4-trinity-dev
 Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
@@ -376,7 +376,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkscan-trinity-dev (<< 4:14.0.0)
 Breaks: libkscan-trinity-dev (<< 4:14.0.0)
-Depends: libkscan1-trinity (= ${binary:Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libkscan1-trinity (= ${binary:Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
  .
diff --git a/ubuntu/maverick/tdegraphics/debian/control.in b/ubuntu/maverick/tdegraphics/debian/control.in
index 678200a9a..f84b69851 100644
--- a/ubuntu/maverick/tdegraphics/debian/control.in
+++ b/ubuntu/maverick/tdegraphics/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, tdelibs4-dev (>= 4:3.5.6), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, tdelibs4-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
 Package: tdegraphics
@@ -66,7 +66,7 @@ Description: a color palette editor and color picker for KDE
 Package: tdegraphics-dev
 Section: devel
 Architecture: any
-Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), tdelibs4-dev
 Description: development files for the KDE graphics module
  This package contains headers and other development files for the KDE
  graphics module.
@@ -350,7 +350,7 @@ Description: generic framework for viewer applications in KDE
 Package: libkscan-dev
 Section: libdevel
 Architecture: any
-Depends: libkscan1 (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libkscan1 (= ${binary:Version}), tdelibs4-dev
 Description: development files for the KDE scanner library
  This package contains development files for KDE's scanner library.
  .
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index 36ddac249..3e4f0c49b 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index 2e2bdf3ee..a88ed600f 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -35,8 +35,6 @@ DEB_FIXPERMS_EXCLUDE := \
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdelibs-trinity-dbg
 
-DEB_DH_MAKESHLIBS_ARGS_tdelibs4c2a-trinity := -V'tdelibs4c2a-trinity (>= 4:3.5.8-1)'
-
 binary-install/tdelibs-data-trinity::
 	install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
 	install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/maverick/tdemultimedia/debian/control
index 4cf40192e..71e6c32f4 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control
+++ b/ubuntu/maverick/tdemultimedia/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdemultimedia-trinity
@@ -31,7 +31,7 @@ Section: devel
 Architecture: any
 Replaces: kdemultimedia-trinity-dev (<< 4:14.0.0)
 Breaks: kdemultimedia-trinity-dev (<< 4:14.0.0)
-Depends: tdelibs4-trinity-dev (>= 4:3.5.7), artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
+Depends: tdelibs4-trinity-dev, artsbuilder-trinity (= ${Source-Version}), tdemultimedia-kio-plugins-trinity (= ${Source-Version}), kmid-trinity (= ${Source-Version}), kmix-trinity (= ${Source-Version}), krec-trinity (= ${Source-Version}), kscd-trinity (= ${Source-Version}), libarts1-akode-trinity (= ${Source-Version}), libarts1-mpeglib-trinity (= ${Source-Version}), libkcddb1-trinity (= ${Source-Version}), mpeglib-trinity (= ${Source-Version}), noatun-trinity (= ${Source-Version})
 Conflicts: libmpeg-trinity-dev
 Description: development files for the Trinity multimedia module
  Development files and headers for the Trinity multimedia module.
diff --git a/ubuntu/maverick/tdemultimedia/debian/control.in b/ubuntu/maverick/tdemultimedia/debian/control.in
index 7487b21fb..7b20cca6d 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control.in
+++ b/ubuntu/maverick/tdemultimedia/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libltdl3-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs4-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libltdl3-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev
 Standards-Version: 3.7.2
 
 Package: tdemultimedia
@@ -27,7 +27,7 @@ Description: multimedia apps from the official KDE release
 Package: tdemultimedia-dev
 Section: devel
 Architecture: any
-Depends: tdelibs4-dev (>= 4:3.5.8), artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
+Depends: tdelibs4-dev, artsbuilder (= ${Source-Version}), tdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
 Conflicts: libmpeg-dev
 Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0)
 Description: development files for the KDE multimedia module
diff --git a/ubuntu/maverick/tdemultimedia/debian/rules b/ubuntu/maverick/tdemultimedia/debian/rules
index 1696038de..336c7e70d 100755
--- a/ubuntu/maverick/tdemultimedia/debian/rules
+++ b/ubuntu/maverick/tdemultimedia/debian/rules
@@ -27,14 +27,6 @@ PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid
 	libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \
 	libkcddb1-trinity mpeglib-trinity noatun-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_artsbuilder-trinity			:= -V'artsbuilder-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kmid-trinity			:= -V'kmid-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libkcddb1-trinity			:= -V'libkcddb1-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_mpeglib-trinity			:= -V'mpeglib-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_noatun-trinity			:= -V'noatun-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libarts1-mpeglib-trinity		:= -V'libarts1-mpeglib-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_tdemultimedia-kio-plugins-trinity 	:= -V'tdemultimedia-kio-plugins-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control
index 3c92cf20a..c9d49f957 100644
--- a/ubuntu/maverick/tdenetwork/debian/control
+++ b/ubuntu/maverick/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
@@ -308,7 +308,7 @@ Section: devel
 Architecture: any
 Replaces: kdenetwork-trinity-dev (<< 4:14.0.0)
 Breaks: kdenetwork-trinity-dev (<< 4:14.0.0)
-Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kdict-trinity (= ${Source-Version}), kopete-trinity (= ${Source-Version}), ksirc-trinity (= ${Source-Version}), librss1-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity network module
  This is the development package which contains the headers for the KDE RSS
  library as well as the Kopete chat client, as well as miscellaneous
diff --git a/ubuntu/maverick/tdenetwork/debian/control.in b/ubuntu/maverick/tdenetwork/debian/control.in
index 1a1f80350..76c4eadc2 100644
--- a/ubuntu/maverick/tdenetwork/debian/control.in
+++ b/ubuntu/maverick/tdenetwork/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-dev, libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: tdenetwork
@@ -275,7 +275,7 @@ Description: RSS library for KDE
 Package: tdenetwork-dev
 Section: devel
 Architecture: any
-Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), tdelibs4-dev
 Replaces: librss1-dev, kdict (<< 4:3.5.0-3)
 Conflicts: librss1-dev
 Description: development files for the KDE network module
diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules
index 71afe376c..419a19915 100755
--- a/ubuntu/maverick/tdenetwork/debian/rules
+++ b/ubuntu/maverick/tdenetwork/debian/rules
@@ -30,9 +30,6 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdenetwork-trinity-dbg
 
 PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_librss1-trinity	:= -V'librss1-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kopete-trinity	:= -V'kopete-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 6967dbe4c..ce2e72016 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -116,7 +116,6 @@ Architecture: any
 Replaces: kaddressbook-trinity (<< 4:14.0.0)
 Breaks: kaddressbook-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Suggests: tdepim-kresources-trinity, tdebase-kio-plugins-trinity
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
@@ -174,7 +173,6 @@ Section: utils
 Architecture: any
 Replaces: karm-trinity (<< 4:14.0.0)
 Breaks: karm-trinity (<< 4:14.0.0)
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Depends: ${shlibs:Depends}
 Description: Trinity time tracker tool
  KArm is a time tracker for busy people who need to keep track of the amount of
@@ -274,7 +272,6 @@ Breaks: kmail-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-kio-plugins-trinity, tdebase-kio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Provides: imap-client, mail-reader
 Description: Trinity Email client
  KMail is a fully-featured email client that fits nicely into the KDE
@@ -325,7 +322,6 @@ Replaces: knotes-trinity (<< 4:14.0.0)
 Breaks: knotes-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: tdepim-kresources-trinity
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Description: Trinity sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
@@ -389,7 +385,6 @@ Replaces: korganizer-trinity (<< 4:14.0.0)
 Breaks: korganizer-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: kghostview-trinity
-Conflicts: kontact-trinity (<< 4:3.5.7-1ubuntu5)
 Description: Trinity personal organizer
  This package contains KOrganizer, a calendar and scheduling program.
  .
@@ -518,7 +513,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkdepim1-trinity-dev (<< 4:14.0.0)
 Breaks: libkdepim1-trinity-dev (<< 4:14.0.0)
-Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.7)
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: Trinity PIM library [development]
  This is the development package which contains the headers for the libtdepim-trinity
  library.
diff --git a/ubuntu/maverick/tdepim/debian/control.in b/ubuntu/maverick/tdepim/debian/control.in
index 88bd2e756..3b45c48d0 100644
--- a/ubuntu/maverick/tdepim/debian/control.in
+++ b/ubuntu/maverick/tdepim/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake1.9,
- cdparanoia, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), bison, byacc, bzip2,
+ cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
@@ -481,7 +481,7 @@ Description: KDE PIM library
 Package: libtdepim1-dev
 Section: libdevel
 Architecture: any
-Depends: libtdepim1a (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libtdepim1a (= ${Source-Version}), tdelibs4-dev
 Replaces: tdepim-dev (<< 4:3.4.1)
 Description: KDE PIM library [development]
  This is the development package which contains the headers for the libtdepim
diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index 07760541d..16d2c2e6b 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/tdesdk/debian/control
@@ -5,9 +5,9 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, tdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
- tdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
- libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev,
+ gettext, pkg-config, tdelibs4-trinity-dev, binutils-dev, bison, flex,
+ tdepim-trinity-dev, libapr1-dev, libkcal2-trinity-dev,
+ libktnef1-trinity-dev, libsvn-dev, libdb-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
@@ -73,7 +73,7 @@ Section: devel
 Replaces: kapptemplate-trinity (<< 4:14.0.0)
 Breaks: kapptemplate-trinity (<< 4:14.0.0)
 Conflicts: kapptemplate
-Recommends: automake1.9 | automaken, tdelibs4-trinity-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-trinity-dev
 Description: creates a framework to develop a Trinity application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -111,7 +111,7 @@ Architecture: any
 Section: libdevel
 Replaces: kbabel-trinity-dev (<< 4:14.0.0)
 Breaks: kbabel-trinity-dev (<< 4:14.0.0)
-Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: kbabel
 Description: PO-file editing suite for Trinity (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -282,7 +282,7 @@ Architecture: any
 Section: devel
 Replaces: kspy-trinity (<< 4:14.0.0)
 Breaks: kspy-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-trinity-dev
 Conflicts: kspy
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
@@ -340,7 +340,7 @@ Architecture: any
 Section: libdevel
 Replaces: libcvsservice-trinity-dev (<< 4:14.0.0)
 Breaks: libcvsservice-trinity-dev (<< 4:14.0.0)
-Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: libcvsservice-dev
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
diff --git a/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in
index 7680adce7..6aaa2bce3 100644
--- a/ubuntu/maverick/tdesdk/debian/control.in
+++ b/ubuntu/maverick/tdesdk/debian/control.in
@@ -5,9 +5,9 @@ Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, tdelibs4-dev (>= 4:3.5.8), binutils-dev, bison, flex,
- tdepim-dev (>= 4:3.5.8), libapr1-dev, libkcal2-dev (>= 4:3.5.8),
- libktnef1-dev (>= 4:3.5.8), libsvn-dev
+ gettext, pkg-config, tdelibs4-dev, binutils-dev, bison, flex,
+ tdepim-dev, libapr1-dev, libkcal2-dev,
+ libktnef1-dev, libsvn-dev
 Standards-Version: 3.7.2
 
 Package: tdesdk
@@ -63,7 +63,7 @@ Description: a graphical CVS front end for KDE
 Package: kapptemplate
 Architecture: all
 Section: devel
-Recommends: automake1.9 | automaken, tdelibs4-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-dev
 Description: creates a framework to develop a KDE application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -96,7 +96,7 @@ Description: PO-file editing suite for KDE
 Package: kbabel-dev
 Architecture: any
 Section: libdevel
-Depends: kbabel (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kbabel (= ${Source-Version}), tdelibs4-dev
 Replaces: kbabel (<< 4:3.0.8-0)
 Description: PO-file editing suite for KDE (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -245,7 +245,7 @@ Description: a KDE GUI for viewing differences between files
 Package: kspy
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, tdelibs4-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-dev
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
  the QObjects in use by a Qt/KDE app.  In addition to the object tree,
@@ -295,7 +295,7 @@ Description: DCOP service for accessing CVS repositories
 Package: libcvsservice-dev
 Architecture: any
 Section: libdevel
-Depends: libcvsservice0 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libcvsservice0 (= ${Source-Version}), tdelibs4-dev
 Replaces: cervisia (<< 4:3.2.0)
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules
index d63a59865..5a7eda7d0 100755
--- a/ubuntu/maverick/tdesdk/debian/rules
+++ b/ubuntu/maverick/tdesdk/debian/rules
@@ -18,13 +18,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 
 PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kbabel-trinity			:= -V'kbabel-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kompare-trinity			:= -V'kompare-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kspy-trinity			:= -V'kspy-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kunittest-trinity			:= -V'kunittest-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libcvsservice0-trinity		:= -V'libcvsservice0-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_umbrello-trinity			:= -V'umbrello-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/ubuntu/maverick/tdetoys/debian/control b/ubuntu/maverick/tdetoys/debian/control
index 747939d88..e583487ae 100644
--- a/ubuntu/maverick/tdetoys/debian/control
+++ b/ubuntu/maverick/tdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdetoys-trinity
diff --git a/ubuntu/maverick/tdetoys/debian/control.in b/ubuntu/maverick/tdetoys/debian/control.in
index d1954caad..5fb46a280 100644
--- a/ubuntu/maverick/tdetoys/debian/control.in
+++ b/ubuntu/maverick/tdetoys/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev, gawk, gettext, sharutils
 Standards-Version: 3.7.2
 
 Package: tdetoys
diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index 9f2fb051c..290f65d7f 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), tdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
@@ -61,7 +61,7 @@ Section: utils
 Architecture: any
 Replaces: kdeutils-trinity-dev (<< 4:14.0.0)
 Breaks: kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity utilities module
  This package contains development files needed to compile tdeutils
  applications.
@@ -202,7 +202,7 @@ Section: tde
 Architecture: any
 Replaces: kgpg-trinity (<< 4:14.0.0)
 Breaks: kgpg-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, konsole-trinity (>= 4:3.5.8), gnupg
+Depends: ${shlibs:Depends}, konsole-trinity, gnupg
 Suggests: khelpcenter-trinity
 Description: GnuPG frontend for Trinity
  Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
diff --git a/ubuntu/maverick/tdeutils/debian/control.in b/ubuntu/maverick/tdeutils/debian/control.in
index d8263e1cd..f1d64bd00 100644
--- a/ubuntu/maverick/tdeutils/debian/control.in
+++ b/ubuntu/maverick/tdeutils/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), tdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, tdebase-dev, libkonq4-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-doc
 Standards-Version: 3.7.2
 
@@ -53,7 +53,7 @@ Description: KDE utilities documentation in HTML format
 Package: tdeutils-dev
 Section: utils
 Architecture: any
-Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), khexedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), tdelibs4-dev
 Description: development files for the KDE utilities module
  This package contains development files needed to compile tdeutils
  applications.
@@ -178,7 +178,7 @@ Description: floppy formatter for KDE
 Package: kgpg
 Section: tde
 Architecture: any
-Depends: ${shlibs:Depends}, konsole (>= 4:3.5.8), gnupg
+Depends: ${shlibs:Depends}, konsole, gnupg
 Suggests: khelpcenter
 Description: GnuPG frontend for KDE
  Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/maverick/tdeutils/debian/rules
index a83c83fdf..0dfac3ab0 100755
--- a/ubuntu/maverick/tdeutils/debian/rules
+++ b/ubuntu/maverick/tdeutils/debian/rules
@@ -22,12 +22,6 @@ DEB_DH_STRIP_ARGS  := --exclude=examples --dbg-package=tdeutils-trinity-dbg
 
 PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_khexedit-trinity		:= -V'khexedit-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon-trinity	:= -V'klaptopdaemon-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kmilo-trinity		:= -V'kmilo-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kregexpeditor-trinity	:= -V'kregexpeditor-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksim-trinity		:= -V'ksim-trinity (>= 4:3.5.7-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
diff --git a/ubuntu/maverick/tdevelop/debian/control b/ubuntu/maverick/tdevelop/debian/control
index b5b2032d9..6203fd52d 100644
--- a/ubuntu/maverick/tdevelop/debian/control
+++ b/ubuntu/maverick/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev (>= 4:3.5.10), gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdevelop-trinity
diff --git a/ubuntu/maverick/tdewebdev/debian/control b/ubuntu/maverick/tdewebdev/debian/control
index b306cdb69..542f7f514 100644
--- a/ubuntu/maverick/tdewebdev/debian/control
+++ b/ubuntu/maverick/tdewebdev/debian/control
@@ -171,7 +171,7 @@ Architecture: any
 Section: libdevel
 Replaces: kommander-trinity-dev (<< 4:14.0.0)
 Breaks: kommander-trinity-dev (<< 4:14.0.0)
-Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev
 Description: development files for Kommander [Trinity]
  This package contains the headers and other development files for
  building plugins or otherwise extending Kommander.
diff --git a/ubuntu/maverick/tdewebdev/debian/control.in b/ubuntu/maverick/tdewebdev/debian/control.in
index cbc4129c9..aa1dcb562 100644
--- a/ubuntu/maverick/tdewebdev/debian/control.in
+++ b/ubuntu/maverick/tdewebdev/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libcvsservice-dev (>= 4:3.5.8), libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.7.2
 
 Package: tdewebdev
@@ -157,7 +157,7 @@ Description: visual dialog builder and executor tool
 Package: kommander-dev
 Architecture: any
 Section: libdevel
-Depends: kommander (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kommander (= ${Source-Version}), tdelibs4-dev
 Replaces: kommander (<< 1:3.3.0)
 Description: development files for Kommander
  This package contains the headers and other development files for
diff --git a/ubuntu/maverick/tdewebdev/debian/rules b/ubuntu/maverick/tdewebdev/debian/rules
index 888f66bcf..5a5ea2fd9 100755
--- a/ubuntu/maverick/tdewebdev/debian/rules
+++ b/ubuntu/maverick/tdewebdev/debian/rules
@@ -30,7 +30,5 @@ DEB_DH_STRIP_ARGS  := --dbg-package=tdewebdev-trinity-dbg
 
 PACKAGES_WITH_LIBS := kommander-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kommander-trinity := -V'kommander-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))