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

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

13 files changed, 15 insertions, 19 deletions

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