DEB: Switch Build-Depends from cmake to cmake-trinity.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

60 files changed, 83 insertions, 101 deletions

diff --git a/debian/_base/applications/abakus/debian/control b/debian/_base/applications/abakus/debian/control
index 8b9b7b565..5c3344c1a 100644
--- a/debian/_base/applications/abakus/debian/control
+++ b/debian/_base/applications/abakus/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), quilt, cdbs (>= 0.4.0), cmake, imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4
 
 Package: abakus-trinity
diff --git a/debian/_base/applications/amarok.cmake/debian/control b/debian/_base/applications/amarok.cmake/debian/control
index b0f632bea..b44170f51 100644
--- a/debian/_base/applications/amarok.cmake/debian/control
+++ b/debian/_base/applications/amarok.cmake/debian/control
@@ -4,15 +4,14 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, cmake-trinity, bzip2,
  kdelibs4-trinity-dev,
  libxine-dev, libdbus-tqt-1-dev,
  libtag1-dev, libsqlite3-dev, libtunepimp-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,
- ruby, ruby1.8-dev, kdebase-trinity-dev,
- libtool, libltdl-dev, cmake
+ ruby, ruby1.8-dev, kdebase-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://amarok.kde.org
 
diff --git a/debian/_base/applications/dolphin/debian/control b/debian/_base/applications/dolphin/debian/control
index 865595c90..eb22c16c7 100644
--- a/debian/_base/applications/dolphin/debian/control
+++ b/debian/_base/applications/dolphin/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, kdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, libkonq4-trinity-dev, kdebase-trinity-dev, docbook2x, docbook-xml
 Standards-Version: 3.8.4
 
 Package: dolphin-trinity
diff --git a/debian/_base/applications/gtk-qt-engine/debian/control b/debian/_base/applications/gtk-qt-engine/debian/control
index 730aabc0f..922dbaa17 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/control
+++ b/debian/_base/applications/gtk-qt-engine/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1)
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, libgtk2.0-dev (>= 2.10.1)
 Standards-Version: 3.8.4
 
 Package: gtk-qt-engine-trinity
diff --git a/debian/_base/applications/kbfx/debian/control b/debian/_base/applications/kbfx/debian/control
index 05997f826..3bb0f7157 100644
--- a/debian/_base/applications/kbfx/debian/control
+++ b/debian/_base/applications/kbfx/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, kdelibs4-trinity-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kbfx-trinity
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/control b/debian/_base/applications/kde-style-qtcurve/debian/control
index 3f4b12a02..d09df8fe6 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/control
+++ b/debian/_base/applications/kde-style-qtcurve/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, kdelibs4-trinity-dev, cmake, cdbs
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kde-style-qtcurve-trinity
diff --git a/debian/_base/applications/kdesvn/debian/control b/debian/_base/applications/kdesvn/debian/control
index 460fa2e5c..e9d2e2eb4 100644
--- a/debian/_base/applications/kdesvn/debian/control
+++ b/debian/_base/applications/kdesvn/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs (>= 0.4.50), debhelper (>= 7.0.50~), cmake (>= 2.4), kdelibs4-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, quilt, libaprutil1-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, libaprutil1-dev
 Standards-Version: 3.8.4
 
 Package: libsvnqt4-trinity
diff --git a/debian/_base/applications/kgtk-qt3/debian/control b/debian/_base/applications/kgtk-qt3/debian/control
index df1033403..7ca9ae0bf 100644
--- a/debian/_base/applications/kgtk-qt3/debian/control
+++ b/debian/_base/applications/kgtk-qt3/debian/control
@@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/debian/_base/applications/kio-locate/debian/control b/debian/_base/applications/kio-locate/debian/control
index 53344d660..6aaeedee1 100644
--- a/debian/_base/applications/kio-locate/debian/control
+++ b/debian/_base/applications/kio-locate/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, kdelibs4-trinity-dev, bzip2, python (>= 2.3), cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, bzip2, python (>= 2.3)
 Standards-Version: 3.8.4
 
 Package: kio-locate-trinity
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/control b/debian/_base/applications/knetworkmanager.cmake/debian/control
index 73fa9be0d..c0430c74b 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/control
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/control
@@ -2,8 +2,7 @@ Source: knetworkmanager-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs,
- debhelper (>= 7),
+Build-Depends: cdbs, debhelper (>= 7), quilt, cmake-trinity,
  pkg-config,
  kdelibs4-trinity-dev,
  libnm-util-dev (>= 0.7.0),
@@ -13,12 +12,10 @@ Build-Depends: cdbs,
  libdbus-1-tqt-dev (>= 0.8.1),
  libiw-dev,
  libnl-dev (>= 1.1),
- quilt,
  network-manager-vpnc,
  network-manager-openvpn,
  network-manager-strongswan,
- network-manager-pptp,
- libtool, libltdl-dev, cmake
+ network-manager-pptp
 Standards-Version: 3.8.3
 Homepage: http://opensuse.org/Projects/KNetworkManager
 
diff --git a/debian/_base/applications/kpowersave.cmake/debian/control b/debian/_base/applications/kpowersave.cmake/debian/control
index b5aed9d71..d9521d559 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/control
+++ b/debian/_base/applications/kpowersave.cmake/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, cmake-trinity, kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/debian/_base/applications/rosegarden/debian/control b/debian/_base/applications/rosegarden/debian/control
index 135319eab..a1488542c 100644
--- a/debian/_base/applications/rosegarden/debian/control
+++ b/debian/_base/applications/rosegarden/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
 Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/debian/_base/applications/wlassistant/debian/control b/debian/_base/applications/wlassistant/debian/control
index 16e9edfe8..711687428 100644
--- a/debian/_base/applications/wlassistant/debian/control
+++ b/debian/_base/applications/wlassistant/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cmake, cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4
 
 Package: wlassistant-trinity
diff --git a/debian/_base/core/kdeartwork/debian/control b/debian/_base/core/kdeartwork/debian/control
index 258bb466a..6641e90d6 100644
--- a/debian/_base/core/kdeartwork/debian/control
+++ b/debian/_base/core/kdeartwork/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 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>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, autotools-dev, kdelibs4-trinity-dev, gawk, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
-Build-Conflicts: autoconf2.13, nvidia-glx
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
+Build-Conflicts: nvidia-glx
 Standards-Version: 3.8.4
 
 Package: kdeartwork-trinity
diff --git a/debian/_base/core/kdebase/debian/control b/debian/_base/core/kdebase/debian/control
index 74cb7c606..e98b0cc85 100644
--- a/debian/_base/core/kdebase/debian/control
+++ b/debian/_base/core/kdebase/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 (>= 7.0.50~), quilt, autotools-dev, gawk, kdelibs4-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, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libart-2.0-dev (>= 2.3.17), libtool, libltdl-dev, binutils-dev, cmake
+Build-Depends: debhelper (>= 7.0.50~), quilt, cmake-trinity, sharutils, kdelibs4-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, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libart-2.0-dev (>= 2.3.17), binutils-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, kdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/debian/_base/core/kdegraphics/debian/control b/debian/_base/core/kdegraphics/debian/control
index 4a508e13b..e73df881e 100644
--- a/debian/_base/core/kdegraphics/debian/control
+++ b/debian/_base/core/kdegraphics/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 (>= 7.0.50~), quilt, autotools-dev, gawk, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev (>= 4:3.5.10), imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, libusb-dev, libxxf86vm-dev, chrpath [powerpc]
 Standards-Version: 3.8.4
 
 Package: kdegraphics-trinity
diff --git a/debian/_base/core/kdelibs/debian/control b/debian/_base/core/kdelibs/debian/control
index 6f244f760..51538fb2f 100644
--- a/debian/_base/core/kdelibs/debian/control
+++ b/debian/_base/core/kdelibs/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Adeodato Simó <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 7.0.50~), quilt, autotools-dev,
- binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, gawk,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, sharutils,
+ binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man,
  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],
  aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev,
@@ -14,9 +14,9 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 7.0.50~), quilt, autotools
  libsasl2-dev, libssl-dev, libxcomposite-dev,
  libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
- sharutils, texinfo, libogg-dev, libtqtinterface-dev,
+ texinfo, libogg-dev, libtqtinterface-dev,
  lsb-release, base-files, sudo,
- cmake, libltdl-dev, libmagic-dev
+ libltdl-dev, libmagic-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 
diff --git a/debian/_base/core/kdenetwork/debian/control b/debian/_base/core/kdenetwork/debian/control
index 9d525f56e..0a7afcab7 100644
--- a/debian/_base/core/kdenetwork/debian/control
+++ b/debian/_base/core/kdenetwork/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 (>= 7.0.50~), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, docbook-to-man, doxygen, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel], libxxf86vm-dev, libv4l-dev
 Standards-Version: 3.8.4
 
 Package: kdenetwork-trinity
diff --git a/debian/_base/core/kdepim/debian/control b/debian/_base/core/kdepim/debian/control
index 3a89e4b2e..74f89bc52 100644
--- a/debian/_base/core/kdepim/debian/control
+++ b/debian/_base/core/kdepim/debian/control
@@ -4,15 +4,14 @@ 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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity,
  cdparanoia, gawk, kdelibs4-trinity-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev, libogg-dev,
  libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
  libpisock-dev, libreadline5-dev | libreadline6-dev, libsasl2-dev, libssl-dev,
- libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
+ libtool (>= 1.5), libxpm-dev, libxss-dev, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
- libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev,
- cmake, libtool, libltdl-dev
+ libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, kdelibs4-trinity-doc
 Build-Conflicts: libkleopatra0-trinity-dev
 Standards-Version: 3.8.4
diff --git a/debian/_base/core/kdesdk/debian/control b/debian/_base/core/kdesdk/debian/control
index 18a3d9807..1127d6d14 100644
--- a/debian/_base/core/kdesdk/debian/control
+++ b/debian/_base/core/kdesdk/debian/control
@@ -4,11 +4,10 @@ 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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, autotools-dev, gawk,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity,
  pkg-config, kdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
  kdepim-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,
- automake, autoconf, libtool, libltdl-dev
+ libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev
 Standards-Version: 3.8.4
 
 Package: kdesdk-trinity
diff --git a/debian/_base/core/kdetoys/debian/control b/debian/_base/core/kdetoys/debian/control
index d0ef1c1e9..0252fd2d3 100644
--- a/debian/_base/core/kdetoys/debian/control
+++ b/debian/_base/core/kdetoys/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 (>= 7.0.50~), quilt, cmake, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev (>= 4:3.5.10)
 Standards-Version: 3.8.4
 
 Package: kdetoys-trinity
diff --git a/debian/_base/core/kdeutils/debian/control b/debian/_base/core/kdeutils/debian/control
index 519dc9e5a..375dcaddf 100644
--- a/debian/_base/core/kdeutils/debian/control
+++ b/debian/_base/core/kdeutils/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, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, autotools-dev, gawk, kdelibs4-trinity-dev (>= 4:3.5.10), kdebase-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: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev (>= 4:3.5.10), kdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, kdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
diff --git a/debian/_base/core/kdevelop.cmake/debian/control b/debian/_base/core/kdevelop.cmake/debian/control
index aba698abb..aa8bcf2c1 100644
--- a/debian/_base/core/kdevelop.cmake/debian/control
+++ b/debian/_base/core/kdevelop.cmake/debian/control
@@ -3,7 +3,7 @@ Section: kde
 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), 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, debhelper (>= 5), quilt, cmake-trinity, qt3-apps-dev, kdelibs4-trinity-dev (>= 4:3.5.10), kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev
 Standards-Version: 3.8.4
 
 Package: kdevelop-trinity
diff --git a/debian/_base/core/kdevelop/debian/control b/debian/_base/core/kdevelop/debian/control
index 6dd1f0a24..b5ea939e8 100644
--- a/debian/_base/core/kdevelop/debian/control
+++ b/debian/_base/core/kdevelop/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jeremy Lainé <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 7.0.50~), quilt, cmake, kdelibs4-trinity-dev (>= 4:3.5.10), kdelibs4-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, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev (>= 4:3.5.10), kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
 Standards-Version: 3.8.4
 
 Package: kdevelop-trinity
diff --git a/debian/_base/dependencies/akode/debian/control b/debian/_base/dependencies/akode/debian/control
index b411183de..ad0ec80e6 100644
--- a/debian/_base/dependencies/akode/debian/control
+++ b/debian/_base/dependencies/akode/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: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, gawk, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev
 Standards-Version: 3.7.3
 
 Package: libakode2
diff --git a/debian/_base/dependencies/arts/debian/control b/debian/_base/dependencies/arts/debian/control
index 842e6ba67..c2d75c2c5 100644
--- a/debian/_base/dependencies/arts/debian/control
+++ b/debian/_base/dependencies/arts/debian/control
@@ -4,12 +4,12 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org>
 Priority: optional
 Uploaders: Adeodato Simó <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs (>= 0.4.48), debhelper (>= 7.0.50~), quilt,
- docbook-to-man, gawk, sharutils, texinfo,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity,
+ docbook-to-man, texinfo,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev,
  libogg-dev, libtqtinterface-dev,
- libvorbis-dev, cmake, libltdl-dev
+ libvorbis-dev, libltdl-dev
 Build-Conflicts: libmas-dev
 Standards-Version: 3.8.4
 
diff --git a/debian/_base/dependencies/avahi-tqt/debian/control b/debian/_base/dependencies/avahi-tqt/debian/control
index 178ad58a4..66690ade7 100644
--- a/debian/_base/dependencies/avahi-tqt/debian/control
+++ b/debian/_base/dependencies/avahi-tqt/debian/control
@@ -4,11 +4,8 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~),
-               cmake,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity,
                gcc,
-               cdbs,
-               quilt,
                pkg-config,
                libtqtinterface-dev,
                libavahi-common-dev,
diff --git a/debian/_base/dependencies/dbus-1-tqt/debian/control b/debian/_base/dependencies/dbus-1-tqt/debian/control
index fdc5f9fcb..d3aceae98 100644
--- a/debian/_base/dependencies/dbus-1-tqt/debian/control
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/control
@@ -2,7 +2,7 @@ Source: dbus-1-tqt
 Section: devel
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, libtqtinterface-dev, libdbus-1-dev (>= 0.90)
 Standards-Version: 3.8.3
 
 Package: libdbus-1-tqt-dev
diff --git a/debian/_base/dependencies/dbus-tqt/debian/control b/debian/_base/dependencies/dbus-tqt/debian/control
index 6c939ba09..1acdb124f 100644
--- a/debian/_base/dependencies/dbus-tqt/debian/control
+++ b/debian/_base/dependencies/dbus-tqt/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Dröge <slomo@ubuntu.com>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, libtqtinterface-dev, libdbus-1-dev (>= 0.90)
 Standards-Version: 3.8.3
 
 Package: libdbus-tqt-1-dev
diff --git a/debian/_base/dependencies/tqtinterface/debian/control b/debian/_base/dependencies/tqtinterface/debian/control
index 017aabe0e..b672a9fa5 100644
--- a/debian/_base/dependencies/tqtinterface/debian/control
+++ b/debian/_base/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, libqt3-mt-dev, qt3-apps-dev, cmake, cdbs
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, libqt3-mt-dev, qt3-apps-dev
 Standards-Version: 3.8.4
 
 Package: libtqtinterface
diff --git a/ubuntu/_base/applications/abakus/debian/control b/ubuntu/_base/applications/abakus/debian/control
index ae5612518..1ddf621fe 100644
--- a/ubuntu/_base/applications/abakus/debian/control
+++ b/ubuntu/_base/applications/abakus/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), quilt, cdbs (>= 0.4.0), cmake, imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, imagemagick, kdelibs4-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4
 
 Package: abakus-trinity
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/control b/ubuntu/_base/applications/amarok.cmake/debian/control
index 3b2edf097..632c090cb 100644
--- a/ubuntu/_base/applications/amarok.cmake/debian/control
+++ b/ubuntu/_base/applications/amarok.cmake/debian/control
@@ -4,15 +4,14 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, cmake-trinity, bzip2,
  kdelibs4-trinity-dev,
  libxine-dev, libdbus-tqt-1-dev,
  libtag1-dev, libsqlite3-dev, libtunepimp-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,
- ruby, ruby1.8-dev, kdebase-trinity-dev,
- libtool, libltdl-dev, cmake
+ ruby, ruby1.8-dev, kdebase-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://amarok.kde.org
 
diff --git a/ubuntu/_base/applications/dolphin/debian/control b/ubuntu/_base/applications/dolphin/debian/control
index 5688d3fe8..73051f2b7 100644
--- a/ubuntu/_base/applications/dolphin/debian/control
+++ b/ubuntu/_base/applications/dolphin/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, kdelibs4-trinity-dev, libkonq4-trinity-dev, kdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, libkonq4-trinity-dev, kdebase-trinity-dev, docbook2x, docbook-xml
 Standards-Version: 3.8.4
 
 Package: dolphin-trinity
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/control b/ubuntu/_base/applications/gtk-qt-engine/debian/control
index 4896faef2..37ed56382 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/control
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1)
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, libgtk2.0-dev (>= 2.10.1)
 Standards-Version: 3.8.4
 
 Package: gtk-qt-engine-trinity
diff --git a/ubuntu/_base/applications/kbfx/debian/control b/ubuntu/_base/applications/kbfx/debian/control
index 82cd6dff8..5c65e0278 100644
--- a/ubuntu/_base/applications/kbfx/debian/control
+++ b/ubuntu/_base/applications/kbfx/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, kdelibs4-trinity-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kbfx-trinity
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/control b/ubuntu/_base/applications/kde-style-qtcurve/debian/control
index 4d67825b0..54bfddddb 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/control
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, kdelibs4-trinity-dev, cmake, cdbs
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kde-style-qtcurve-trinity
diff --git a/ubuntu/_base/applications/kdesvn/debian/control b/ubuntu/_base/applications/kdesvn/debian/control
index 80c8d4f82..f5f2dcd55 100644
--- a/ubuntu/_base/applications/kdesvn/debian/control
+++ b/ubuntu/_base/applications/kdesvn/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs (>= 0.4.50), debhelper (>= 7.0.50~), cmake (>= 2.4), kdelibs4-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, quilt, libaprutil1-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, libaprutil1-dev
 Standards-Version: 3.8.4
 
 Package: libsvnqt4-trinity
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/control b/ubuntu/_base/applications/kgtk-qt3/debian/control
index 7f9ad6c07..c75e6c0ef 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/control
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/control
@@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/ubuntu/_base/applications/kio-locate/debian/control b/ubuntu/_base/applications/kio-locate/debian/control
index 127e577bf..de7de34d0 100644
--- a/ubuntu/_base/applications/kio-locate/debian/control
+++ b/ubuntu/_base/applications/kio-locate/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, kdelibs4-trinity-dev, bzip2, python (>= 2.3), cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, bzip2, python (>= 2.3)
 Standards-Version: 3.8.4
 
 Package: kio-locate-trinity
diff --git a/ubuntu/_base/applications/knetworkmanager.cmake/debian/control b/ubuntu/_base/applications/knetworkmanager.cmake/debian/control
index f8466b606..ef2c82d59 100644
--- a/ubuntu/_base/applications/knetworkmanager.cmake/debian/control
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/control
@@ -2,8 +2,7 @@ Source: knetworkmanager-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs,
- debhelper (>= 7),
+Build-Depends: cdbs, debhelper (>= 7), quilt, cmake-trinity,
  pkg-config,
  kdelibs4-trinity-dev,
  libnm-util-dev (>= 0.7.0),
@@ -13,12 +12,10 @@ Build-Depends: cdbs,
  libdbus-1-tqt-dev (>= 0.8.1),
  libiw-dev,
  libnl-dev (>= 1.1),
- quilt,
  network-manager-vpnc,
  network-manager-openvpn,
  network-manager-strongswan,
- network-manager-pptp,
- libtool, libltdl-dev, cmake
+ network-manager-pptp
 Standards-Version: 3.8.3
 Homepage: http://opensuse.org/Projects/KNetworkManager
 
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/control b/ubuntu/_base/applications/kpowersave.cmake/debian/control
index 7a4166104..4350d74d7 100644
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/control
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, cmake-trinity, kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/ubuntu/_base/applications/rosegarden/debian/control b/ubuntu/_base/applications/rosegarden/debian/control
index e1e502242..43986b08b 100644
--- a/ubuntu/_base/applications/rosegarden/debian/control
+++ b/ubuntu/_base/applications/rosegarden/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
 Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/ubuntu/_base/applications/wlassistant/debian/control b/ubuntu/_base/applications/wlassistant/debian/control
index 9517092c6..da22310dd 100644
--- a/ubuntu/_base/applications/wlassistant/debian/control
+++ b/ubuntu/_base/applications/wlassistant/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cmake, cdbs, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4
 
 Package: wlassistant-trinity
diff --git a/ubuntu/_base/core/kdeartwork/debian/control b/ubuntu/_base/core/kdeartwork/debian/control
index 9b1e84b9a..8f1820076 100644
--- a/ubuntu/_base/core/kdeartwork/debian/control
+++ b/ubuntu/_base/core/kdeartwork/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 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>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, autotools-dev, kdelibs4-trinity-dev, gawk, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
-Build-Conflicts: autoconf2.13, nvidia-glx
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
+Build-Conflicts: nvidia-glx
 Standards-Version: 3.8.4
 
 Package: kdeartwork-trinity
diff --git a/ubuntu/_base/core/kdebase/debian/control b/ubuntu/_base/core/kdebase/debian/control
index 2cd69a996..f1e9ce485 100644
--- a/ubuntu/_base/core/kdebase/debian/control
+++ b/ubuntu/_base/core/kdebase/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 (>= 7.0.50~), quilt, autotools-dev, gawk, kdelibs4-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, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libart-2.0-dev (>= 2.3.17), libtool, libltdl-dev, binutils-dev, cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, sharutils, kdelibs4-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, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, kdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libart-2.0-dev (>= 2.3.17), binutils-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, kdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/ubuntu/_base/core/kdegraphics/debian/control b/ubuntu/_base/core/kdegraphics/debian/control
index f29523e23..f40826d8b 100644
--- a/ubuntu/_base/core/kdegraphics/debian/control
+++ b/ubuntu/_base/core/kdegraphics/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 (>= 7.0.50~), quilt, autotools-dev, gawk, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev (>= 4:3.5.10), imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, libusb-dev, libxxf86vm-dev, chrpath [powerpc]
 Standards-Version: 3.8.4
 
 Package: kdegraphics-trinity
diff --git a/ubuntu/_base/core/kdelibs/debian/control b/ubuntu/_base/core/kdelibs/debian/control
index 9b1e7a198..1f224fa58 100644
--- a/ubuntu/_base/core/kdelibs/debian/control
+++ b/ubuntu/_base/core/kdelibs/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 7.0.50~), quilt, autotools-dev,
- binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, gawk,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, sharutils,
+ binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man,
  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],
  aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev,
@@ -14,9 +14,9 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 7.0.50~), quilt, autotools
  libsasl2-dev, libssl-dev, libxcomposite-dev,
  libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
- sharutils, texinfo, libogg-dev, libtqtinterface-dev,
+ texinfo, libogg-dev, libtqtinterface-dev,
  lsb-release, base-files, sudo,
- cmake, libltdl-dev, libmagic-dev
+ libltdl-dev, libmagic-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/_base/core/kdenetwork/debian/control b/ubuntu/_base/core/kdenetwork/debian/control
index 550042c6b..90df5e540 100644
--- a/ubuntu/_base/core/kdenetwork/debian/control
+++ b/ubuntu/_base/core/kdenetwork/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 (>= 7.0.50~), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, docbook-to-man, doxygen, kdelibs4-trinity-dev (>= 4:3.5.10), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel], libxxf86vm-dev, libv4l-dev
 Standards-Version: 3.8.4
 
 Package: kdenetwork-trinity
diff --git a/ubuntu/_base/core/kdepim/debian/control b/ubuntu/_base/core/kdepim/debian/control
index b36394a10..0cf03f70b 100644
--- a/ubuntu/_base/core/kdepim/debian/control
+++ b/ubuntu/_base/core/kdepim/debian/control
@@ -4,15 +4,14 @@ 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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt,
- cdparanoia, gawk, kdelibs4-trinity-dev, bison, byacc, bzip2,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity,
+ cdparanoia, kdelibs4-trinity-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev, libogg-dev,
  libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
  libpisock-dev, libreadline5-dev | libreadline6-dev, libsasl2-dev, libssl-dev,
- libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
+ libtool (>= 1.5), libxpm-dev, libxss-dev, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
- libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev,
- cmake, libtool, libltdl-dev
+ libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, kdelibs4-trinity-doc
 Build-Conflicts: libkleopatra0-trinity-dev
 Standards-Version: 3.8.4
diff --git a/ubuntu/_base/core/kdesdk/debian/control b/ubuntu/_base/core/kdesdk/debian/control
index 4009a513c..86eb44a2e 100644
--- a/ubuntu/_base/core/kdesdk/debian/control
+++ b/ubuntu/_base/core/kdesdk/debian/control
@@ -4,11 +4,10 @@ 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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, autotools-dev, gawk,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity,
  pkg-config, kdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
  kdepim-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,
- automake, autoconf, libtool, libltdl-dev
+ libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev
 Standards-Version: 3.8.4
 
 Package: kdesdk-trinity
diff --git a/ubuntu/_base/core/kdetoys/debian/control b/ubuntu/_base/core/kdetoys/debian/control
index 14ecc399e..c7814540c 100644
--- a/ubuntu/_base/core/kdetoys/debian/control
+++ b/ubuntu/_base/core/kdetoys/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 (>= 7.0.50~), quilt, cmake, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev (>= 4:3.5.10)
 Standards-Version: 3.8.4
 
 Package: kdetoys-trinity
diff --git a/ubuntu/_base/core/kdeutils/debian/control b/ubuntu/_base/core/kdeutils/debian/control
index 0de5acc8c..286996123 100644
--- a/ubuntu/_base/core/kdeutils/debian/control
+++ b/ubuntu/_base/core/kdeutils/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, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, autotools-dev, gawk, kdelibs4-trinity-dev (>= 4:3.5.10), kdebase-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: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev (>= 4:3.5.10), kdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, kdelibs4-trinity-doc
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/_base/core/kdevelop.cmake/debian/control b/ubuntu/_base/core/kdevelop.cmake/debian/control
index 9dee449b0..e6817cd3e 100644
--- a/ubuntu/_base/core/kdevelop.cmake/debian/control
+++ b/ubuntu/_base/core/kdevelop.cmake/debian/control
@@ -3,7 +3,7 @@ Section: kde
 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), quilt, qt3-apps-dev, kdelibs4-trinity-dev (>= 4:3.5.10), 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, debhelper (>= 5), quilt, cmake-trinity, qt3-apps-dev, kdelibs4-trinity-dev (>= 4:3.5.10), kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev
 Standards-Version: 3.8.4
 
 Package: kdevelop-trinity
diff --git a/ubuntu/_base/core/kdevelop/debian/control b/ubuntu/_base/core/kdevelop/debian/control
index 81c5e5ddc..f9e6efb7b 100644
--- a/ubuntu/_base/core/kdevelop/debian/control
+++ b/ubuntu/_base/core/kdevelop/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 7.0.50~), quilt, cmake, kdelibs4-trinity-dev (>= 4:3.5.10), kdelibs4-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, debhelper (>= 7.0.50~), quilt, cmake-trinity, kdelibs4-trinity-dev (>= 4:3.5.10), kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
 Standards-Version: 3.8.4
 
 Package: kdevelop-trinity
diff --git a/ubuntu/_base/dependencies/akode/debian/control b/ubuntu/_base/dependencies/akode/debian/control
index b411183de..ad0ec80e6 100644
--- a/ubuntu/_base/dependencies/akode/debian/control
+++ b/ubuntu/_base/dependencies/akode/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: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, gawk, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev
 Standards-Version: 3.7.3
 
 Package: libakode2
diff --git a/ubuntu/_base/dependencies/arts/debian/control b/ubuntu/_base/dependencies/arts/debian/control
index 08101e0bb..7cb36b9b3 100644
--- a/ubuntu/_base/dependencies/arts/debian/control
+++ b/ubuntu/_base/dependencies/arts/debian/control
@@ -4,12 +4,12 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org>
 Priority: optional
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs (>= 0.4.48), debhelper (>= 7.0.50~), quilt,
- docbook-to-man, gawk, sharutils, texinfo,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity,
+ docbook-to-man, texinfo,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev,
  libogg-dev, libtqtinterface-dev,
- libvorbis-dev, cmake, libltdl-dev
+ libvorbis-dev, libltdl-dev
 Build-Conflicts: libmas-dev
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/control b/ubuntu/_base/dependencies/avahi-tqt/debian/control
index 178ad58a4..66690ade7 100644
--- a/ubuntu/_base/dependencies/avahi-tqt/debian/control
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/control
@@ -4,11 +4,8 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~),
-               cmake,
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity,
                gcc,
-               cdbs,
-               quilt,
                pkg-config,
                libtqtinterface-dev,
                libavahi-common-dev,
diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/control b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control
index c61b31b55..61d7ebd0e 100644
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/control
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control
@@ -2,7 +2,7 @@ Source: dbus-1-tqt
 Section: devel
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, libtqtinterface-dev, libdbus-1-dev (>= 0.90)
 Standards-Version: 3.8.3
 
 Package: libdbus-1-tqt-dev
diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/control b/ubuntu/_base/dependencies/dbus-tqt/debian/control
index a7e1913b5..53602b2cc 100644
--- a/ubuntu/_base/dependencies/dbus-tqt/debian/control
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, libtqtinterface-dev, libdbus-1-dev (>= 0.90)
 Standards-Version: 3.8.3
 
 Package: libdbus-tqt-1-dev
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/control b/ubuntu/_base/dependencies/tqtinterface/debian/control
index 9859f3bbd..5ee9615e8 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/control
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, libqt3-mt-dev, qt3-apps-dev, cmake, cdbs
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake-trinity, libqt3-mt-dev, qt3-apps-dev
 Standards-Version: 3.8.4
 
 Package: libtqtinterface