Fix missing quilt dependency in control.in on Debian and Ubuntu

Fix missing cdbs dependency on Debian and Ubuntu

236 files changed, 236 insertions, 236 deletions

diff --git a/debian/lenny/applications/abakus/debian/control.in b/debian/lenny/applications/abakus/debian/control.in
index 76cddc997..fd553a9a1 100644
--- a/debian/lenny/applications/abakus/debian/control.in
+++ b/debian/lenny/applications/abakus/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 4.1.0), quilt, cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4
 
 Package: abakus-trinity
diff --git a/debian/lenny/applications/adept/debian/control.in b/debian/lenny/applications/adept/debian/control.in
index 88905f8bc..41a592b20 100644
--- a/debian/lenny/applications/adept/debian/control.in
+++ b/debian/lenny/applications/adept/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: adept-trinity
diff --git a/debian/lenny/applications/digikam/debian/control.in b/debian/lenny/applications/digikam/debian/control.in
index 0b3da427d..98165e514 100644
--- a/debian/lenny/applications/digikam/debian/control.in
+++ b/debian/lenny/applications/digikam/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-trinity-dev (>= 0.16),
diff --git a/debian/lenny/applications/dolphin/debian/control.in b/debian/lenny/applications/dolphin/debian/control.in
index db2383c42..84bfa7754 100644
--- a/debian/lenny/applications/dolphin/debian/control.in
+++ b/debian/lenny/applications/dolphin/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: dolphin-trinity
diff --git a/debian/lenny/applications/kerry/debian/control.in b/debian/lenny/applications/kerry/debian/control.in
index 44a3e83a6..6e19d0e6c 100644
--- a/debian/lenny/applications/kerry/debian/control.in
+++ b/debian/lenny/applications/kerry/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.3
 
diff --git a/debian/lenny/applications/kgtk-qt3/debian/control.in b/debian/lenny/applications/kgtk-qt3/debian/control.in
index 41afcac0d..3227d5035 100644
--- a/debian/lenny/applications/kgtk-qt3/debian/control.in
+++ b/debian/lenny/applications/kgtk-qt3/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 7), cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
+Build-Depends: debhelper (>= 7), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/debian/lenny/applications/koffice/debian/control.in b/debian/lenny/applications/koffice/debian/control.in
index 3e3d1cf11..7199c71e6 100644
--- a/debian/lenny/applications/koffice/debian/control.in
+++ b/debian/lenny/applications/koffice/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.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Build-Depends-Indep: qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 Homepage: http://www.koffice.org
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/control.in b/debian/lenny/applications/kpowersave.cmake/debian/control.in
index 93ddd1c0f..ce5a2530a 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/control.in
+++ b/debian/lenny/applications/kpowersave.cmake/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/debian/lenny/applications/ktorrent/debian/control.in b/debian/lenny/applications/ktorrent/debian/control.in
index 1382f9320..6a6433dca 100644
--- a/debian/lenny/applications/ktorrent/debian/control.in
+++ b/debian/lenny/applications/ktorrent/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: ktorrent-trinity
diff --git a/debian/lenny/applications/kuickshow/debian/control.in b/debian/lenny/applications/kuickshow/debian/control.in
index babce6d11..b1c3bdfc5 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, tdelibs14-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, tdelibs14-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/rosegarden/debian/control.in b/debian/lenny/applications/rosegarden/debian/control.in
index b4cec817e..2ffe952e0 100644
--- a/debian/lenny/applications/rosegarden/debian/control.in
+++ b/debian/lenny/applications/rosegarden/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
+Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/debian/lenny/applications/tde-style-qtcurve/debian/control.in b/debian/lenny/applications/tde-style-qtcurve/debian/control.in
index 1e634aa3c..a3e92a938 100644
--- a/debian/lenny/applications/tde-style-qtcurve/debian/control.in
+++ b/debian/lenny/applications/tde-style-qtcurve/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), tdelibs14-trinity-dev, cmake
+Build-Depends: debhelper (>= 5), quilt, tdelibs14-trinity-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: tde-style-qtcurve-trinity
diff --git a/debian/lenny/applications/tdeio-locate/debian/control.in b/debian/lenny/applications/tdeio-locate/debian/control.in
index d96185b40..1693e4f58 100644
--- a/debian/lenny/applications/tdeio-locate/debian/control.in
+++ b/debian/lenny/applications/tdeio-locate/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
 Standards-Version: 3.8.4
 
 Package: tdeio-locate-trinity
diff --git a/debian/lenny/applications/wlassistant/debian/control.in b/debian/lenny/applications/wlassistant/debian/control.in
index df9d5498b..ca673aa4b 100644
--- a/debian/lenny/applications/wlassistant/debian/control.in
+++ b/debian/lenny/applications/wlassistant/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 4.1.0), quilt, cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4
 
 Package: wlassistant-trinity
diff --git a/debian/lenny/dependencies/arts/debian/control.in b/debian/lenny/dependencies/arts/debian/control.in
index b9f79f602..893e3ac5b 100644
--- a/debian/lenny/dependencies/arts/debian/control.in
+++ b/debian/lenny/dependencies/arts/debian/control.in
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), autotools-dev,
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), quilt, autotools-dev,
  docbook-to-man, gawk, gettext, sharutils, texinfo,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev,
diff --git a/debian/lenny/dependencies/libart-lgpl/debian/control.in b/debian/lenny/dependencies/libart-lgpl/debian/control.in
index 12f7ab436..4dc153450 100644
--- a/debian/lenny/dependencies/libart-lgpl/debian/control.in
+++ b/debian/lenny/dependencies/libart-lgpl/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Josselin Mouette <joss@debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 5), quilt,
                gnome-pkg-tools (>= 0.7),
                cdbs,
                dpkg-dev (>= 1.13.19),
diff --git a/debian/lenny/libraries/libkipi/debian/control.in b/debian/lenny/libraries/libkipi/debian/control.in
index 351f29ef6..b56026751 100644
--- a/debian/lenny/libraries/libkipi/debian/control.in
+++ b/debian/lenny/libraries/libkipi/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
 Standards-Version: 3.8.3
 
 Package: libkipi0-trinity-dev
diff --git a/debian/lenny/tdeaccessibility/debian/control.in b/debian/lenny/tdeaccessibility/debian/control.in
index 70dea8a79..2108f844d 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, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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/tdeaddons/debian/control.in b/debian/lenny/tdeaddons/debian/control.in
index 9b7f2b6f7..e227d9b99 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, 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
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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.in b/debian/lenny/tdeadmin/debian/control.in
index 8958b98e4..20ea38faa 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, libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, 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 4b914794e..3145180fb 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, gawk, gettext, sharutils, tdebase-dev, 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), quilt, 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.in b/debian/lenny/tdebase/debian/control.in
index f135cbfd7..7ce1820cc 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, libdbus-qt-1-dev (>= 0.60), libldap2-dev, 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), quilt, autotools-dev, gawk, gettext, tdelibs4-dev, libdbus-qt-1-dev (>= 0.60), libldap2-dev, 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.8.4
diff --git a/debian/lenny/tdeedu/debian/control.in b/debian/lenny/tdeedu/debian/control.in
index 1e39e143a..25ff08c24 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, 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), quilt, 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
diff --git a/debian/lenny/tdegames/debian/control.in b/debian/lenny/tdegames/debian/control.in
index e4d234b34..89ffd6f4f 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, automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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
 
diff --git a/debian/lenny/tdegraphics/debian/control.in b/debian/lenny/tdegraphics/debian/control.in
index a34ac5090..88b71b09b 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, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
 Package: tdegraphics
diff --git a/debian/lenny/tdelibs/debian/control.in b/debian/lenny/tdelibs/debian/control.in
index 43f0657aa..2589b9e94 100644
--- a/debian/lenny/tdelibs/debian/control.in
+++ b/debian/lenny/tdelibs/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.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
diff --git a/debian/lenny/tdemultimedia/debian/control.in b/debian/lenny/tdemultimedia/debian/control.in
index f79201647..0fb3e254a 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, 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), quilt, 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
diff --git a/debian/lenny/tdenetwork/debian/control.in b/debian/lenny/tdenetwork/debian/control.in
index 3c9f904e6..0c14b82f5 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, libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff-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), quilt, 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, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: tdenetwork
diff --git a/debian/lenny/tdepim/debian/control.in b/debian/lenny/tdepim/debian/control.in
index ab6e20fa4..bab9b686d 100644
--- a/debian/lenny/tdepim/debian/control.in
+++ b/debian/lenny/tdepim/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), automake1.9,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9,
  cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
diff --git a/debian/lenny/tdesdk/debian/control.in b/debian/lenny/tdesdk/debian/control.in
index da3e8d50a..8185ba206 100644
--- a/debian/lenny/tdesdk/debian/control.in
+++ b/debian/lenny/tdesdk/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,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk,
  gettext, pkg-config, tdelibs4-dev, binutils-dev, bison, flex,
  tdepim-dev, libapr1-dev, libkcal2-dev,
  libktnef1-dev, libsvn-dev
diff --git a/debian/lenny/tdetoys/debian/control.in b/debian/lenny/tdetoys/debian/control.in
index 5fb46a280..62da248a9 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, gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, tdelibs4-dev, gawk, gettext, sharutils
 Standards-Version: 3.7.2
 
 Package: tdetoys
diff --git a/debian/lenny/tdeutils/debian/control.in b/debian/lenny/tdeutils/debian/control.in
index c922d5426..27b1a4a27 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, tdebase-dev, libkonq4-dev, 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), quilt, 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
 
diff --git a/debian/lenny/tdewebdev/debian/control.in b/debian/lenny/tdewebdev/debian/control.in
index 0712c3cef..70558c570 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, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs4-dev, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.7.2
 
 Package: tdewebdev
diff --git a/debian/squeeze/applications/abakus/debian/control.in b/debian/squeeze/applications/abakus/debian/control.in
index 76cddc997..fd553a9a1 100644
--- a/debian/squeeze/applications/abakus/debian/control.in
+++ b/debian/squeeze/applications/abakus/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 4.1.0), quilt, cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4
 
 Package: abakus-trinity
diff --git a/debian/squeeze/applications/adept/debian/control.in b/debian/squeeze/applications/adept/debian/control.in
index 88905f8bc..41a592b20 100644
--- a/debian/squeeze/applications/adept/debian/control.in
+++ b/debian/squeeze/applications/adept/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: adept-trinity
diff --git a/debian/squeeze/applications/digikam/debian/control.in b/debian/squeeze/applications/digikam/debian/control.in
index 0b3da427d..98165e514 100644
--- a/debian/squeeze/applications/digikam/debian/control.in
+++ b/debian/squeeze/applications/digikam/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-trinity-dev (>= 0.16),
diff --git a/debian/squeeze/applications/dolphin/debian/control.in b/debian/squeeze/applications/dolphin/debian/control.in
index db2383c42..84bfa7754 100644
--- a/debian/squeeze/applications/dolphin/debian/control.in
+++ b/debian/squeeze/applications/dolphin/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: dolphin-trinity
diff --git a/debian/squeeze/applications/k3b-i18n/debian/control b/debian/squeeze/applications/k3b-i18n/debian/control
index 8086e9390..3c7c3f0aa 100644
--- a/debian/squeeze/applications/k3b-i18n/debian/control
+++ b/debian/squeeze/applications/k3b-i18n/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 6), quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: tdelibs14-trinity-dev
 Standards-Version: 3.8.3
 
diff --git a/debian/squeeze/applications/kchmviewer/debian/control b/debian/squeeze/applications/kchmviewer/debian/control
index 64e1aa522..87b909adf 100644
--- a/debian/squeeze/applications/kchmviewer/debian/control
+++ b/debian/squeeze/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/debian/squeeze/applications/kerry/debian/control.in b/debian/squeeze/applications/kerry/debian/control.in
index 44a3e83a6..6e19d0e6c 100644
--- a/debian/squeeze/applications/kerry/debian/control.in
+++ b/debian/squeeze/applications/kerry/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.3
 
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/control.in b/debian/squeeze/applications/kgtk-qt3/debian/control.in
index 41afcac0d..3227d5035 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/control.in
+++ b/debian/squeeze/applications/kgtk-qt3/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 7), cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
+Build-Depends: debhelper (>= 7), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/debian/squeeze/applications/knights/debian/control b/debian/squeeze/applications/knights/debian/control
index f3c011f12..9bbe55193 100644
--- a/debian/squeeze/applications/knights/debian/control
+++ b/debian/squeeze/applications/knights/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
 Uploaders: Ola Lundqvist <opal@debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, poxml-trinity, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, tdelibs14-trinity-dev, poxml-trinity, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://knights.sourceforge.net/
 
diff --git a/debian/squeeze/applications/koffice-i18n/debian/control b/debian/squeeze/applications/koffice-i18n/debian/control
index f3a2daee9..c3f0c49bb 100644
--- a/debian/squeeze/applications/koffice-i18n/debian/control
+++ b/debian/squeeze/applications/koffice-i18n/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Isaac Clerencia <isaac@debian.org>, Ben Burton <bab@debian.org>
 Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: debhelper (>= 5.0.0), quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.7.2
 
 Package: koffice-i18n-bg-trinity
diff --git a/debian/squeeze/applications/koffice/debian/control.in b/debian/squeeze/applications/koffice/debian/control.in
index 3e3d1cf11..7199c71e6 100644
--- a/debian/squeeze/applications/koffice/debian/control.in
+++ b/debian/squeeze/applications/koffice/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.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Build-Depends-Indep: qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 Homepage: http://www.koffice.org
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/control.in b/debian/squeeze/applications/kpowersave.cmake/debian/control.in
index 93ddd1c0f..ce5a2530a 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/control.in
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/debian/squeeze/applications/ksquirrel/debian/control b/debian/squeeze/applications/ksquirrel/debian/control
index 2c9b9b633..112bb3bf2 100644
--- a/debian/squeeze/applications/ksquirrel/debian/control
+++ b/debian/squeeze/applications/ksquirrel/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl>
 Build-Depends: debhelper (>= 5),
-               quilt,
+               cdbs, quilt,
                libksquirrel-trinity-dev,
                libkonq4-trinity-dev,
                kipi-plugins-trinity,
diff --git a/debian/squeeze/applications/ktechlab/debian/control b/debian/squeeze/applications/ktechlab/debian/control
index 85101cca6..e2fd0b2dd 100644
--- a/debian/squeeze/applications/ktechlab/debian/control
+++ b/debian/squeeze/applications/ktechlab/debian/control
@@ -2,7 +2,7 @@ Source: ktechlab-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 6.0.0), quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6.0.0), cdbs, quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktechlab-trinity
diff --git a/debian/squeeze/applications/ktorrent/debian/control.in b/debian/squeeze/applications/ktorrent/debian/control.in
index 1382f9320..6a6433dca 100644
--- a/debian/squeeze/applications/ktorrent/debian/control.in
+++ b/debian/squeeze/applications/ktorrent/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: ktorrent-trinity
diff --git a/debian/squeeze/applications/kuickshow/debian/control.in b/debian/squeeze/applications/kuickshow/debian/control.in
index babce6d11..b1c3bdfc5 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, tdelibs14-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, tdelibs14-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/rosegarden/debian/control.in b/debian/squeeze/applications/rosegarden/debian/control.in
index b4cec817e..2ffe952e0 100644
--- a/debian/squeeze/applications/rosegarden/debian/control.in
+++ b/debian/squeeze/applications/rosegarden/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
+Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/debian/squeeze/applications/tde-style-lipstik/debian/control b/debian/squeeze/applications/tde-style-lipstik/debian/control
index 113a7ffdc..22ccdffd9 100644
--- a/debian/squeeze/applications/tde-style-lipstik/debian/control
+++ b/debian/squeeze/applications/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs14-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), cdbs, quilt, tdelibs14-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tde-style-lipstik-trinity
diff --git a/debian/squeeze/applications/tde-style-qtcurve/debian/control.in b/debian/squeeze/applications/tde-style-qtcurve/debian/control.in
index 1e634aa3c..a3e92a938 100644
--- a/debian/squeeze/applications/tde-style-qtcurve/debian/control.in
+++ b/debian/squeeze/applications/tde-style-qtcurve/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), tdelibs14-trinity-dev, cmake
+Build-Depends: debhelper (>= 5), quilt, tdelibs14-trinity-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: tde-style-qtcurve-trinity
diff --git a/debian/squeeze/applications/tdeio-locate/debian/control.in b/debian/squeeze/applications/tdeio-locate/debian/control.in
index d96185b40..1693e4f58 100644
--- a/debian/squeeze/applications/tdeio-locate/debian/control.in
+++ b/debian/squeeze/applications/tdeio-locate/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
 Standards-Version: 3.8.4
 
 Package: tdeio-locate-trinity
diff --git a/debian/squeeze/applications/wlassistant/debian/control.in b/debian/squeeze/applications/wlassistant/debian/control.in
index df9d5498b..ca673aa4b 100644
--- a/debian/squeeze/applications/wlassistant/debian/control.in
+++ b/debian/squeeze/applications/wlassistant/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 4.1.0), quilt, cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4
 
 Package: wlassistant-trinity
diff --git a/debian/squeeze/dependencies/arts/debian/control.in b/debian/squeeze/dependencies/arts/debian/control.in
index b9f79f602..893e3ac5b 100644
--- a/debian/squeeze/dependencies/arts/debian/control.in
+++ b/debian/squeeze/dependencies/arts/debian/control.in
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), autotools-dev,
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), quilt, autotools-dev,
  docbook-to-man, gawk, gettext, sharutils, texinfo,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev,
diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/control.in b/debian/squeeze/dependencies/libart-lgpl/debian/control.in
index 12f7ab436..4dc153450 100644
--- a/debian/squeeze/dependencies/libart-lgpl/debian/control.in
+++ b/debian/squeeze/dependencies/libart-lgpl/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Josselin Mouette <joss@debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 5), quilt,
                gnome-pkg-tools (>= 0.7),
                cdbs,
                dpkg-dev (>= 1.13.19),
diff --git a/debian/squeeze/libraries/libkipi/debian/control.in b/debian/squeeze/libraries/libkipi/debian/control.in
index 351f29ef6..b56026751 100644
--- a/debian/squeeze/libraries/libkipi/debian/control.in
+++ b/debian/squeeze/libraries/libkipi/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
 Standards-Version: 3.8.3
 
 Package: libkipi0-trinity-dev
diff --git a/debian/squeeze/tdeaccessibility/debian/control.in b/debian/squeeze/tdeaccessibility/debian/control.in
index 70dea8a79..2108f844d 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, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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/tdeaddons/debian/control.in b/debian/squeeze/tdeaddons/debian/control.in
index 9b7f2b6f7..e227d9b99 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, 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
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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.in b/debian/squeeze/tdeadmin/debian/control.in
index 8958b98e4..20ea38faa 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, libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, 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 4b914794e..3145180fb 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, gawk, gettext, sharutils, tdebase-dev, 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), quilt, 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.in b/debian/squeeze/tdebase/debian/control.in
index c20726136..44f2c510a 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, 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), quilt, 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.8.4
diff --git a/debian/squeeze/tdeedu/debian/control.in b/debian/squeeze/tdeedu/debian/control.in
index 1e39e143a..25ff08c24 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, 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), quilt, 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
diff --git a/debian/squeeze/tdegames/debian/control.in b/debian/squeeze/tdegames/debian/control.in
index e4d234b34..89ffd6f4f 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, automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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
 
diff --git a/debian/squeeze/tdegraphics/debian/control.in b/debian/squeeze/tdegraphics/debian/control.in
index a34ac5090..88b71b09b 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, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
 Package: tdegraphics
diff --git a/debian/squeeze/tdelibs/debian/control.in b/debian/squeeze/tdelibs/debian/control.in
index 43f0657aa..2589b9e94 100644
--- a/debian/squeeze/tdelibs/debian/control.in
+++ b/debian/squeeze/tdelibs/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.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
diff --git a/debian/squeeze/tdemultimedia/debian/control.in b/debian/squeeze/tdemultimedia/debian/control.in
index f79201647..0fb3e254a 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, 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), quilt, 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
diff --git a/debian/squeeze/tdenetwork/debian/control.in b/debian/squeeze/tdenetwork/debian/control.in
index 3c9f904e6..0c14b82f5 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, libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff-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), quilt, 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, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: tdenetwork
diff --git a/debian/squeeze/tdepim/debian/control.in b/debian/squeeze/tdepim/debian/control.in
index ab6e20fa4..bab9b686d 100644
--- a/debian/squeeze/tdepim/debian/control.in
+++ b/debian/squeeze/tdepim/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), automake1.9,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9,
  cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
diff --git a/debian/squeeze/tdesdk/debian/control.in b/debian/squeeze/tdesdk/debian/control.in
index da3e8d50a..8185ba206 100644
--- a/debian/squeeze/tdesdk/debian/control.in
+++ b/debian/squeeze/tdesdk/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,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk,
  gettext, pkg-config, tdelibs4-dev, binutils-dev, bison, flex,
  tdepim-dev, libapr1-dev, libkcal2-dev,
  libktnef1-dev, libsvn-dev
diff --git a/debian/squeeze/tdetoys/debian/control.in b/debian/squeeze/tdetoys/debian/control.in
index 5fb46a280..62da248a9 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, gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, tdelibs4-dev, gawk, gettext, sharutils
 Standards-Version: 3.7.2
 
 Package: tdetoys
diff --git a/debian/squeeze/tdeutils/debian/control.in b/debian/squeeze/tdeutils/debian/control.in
index c922d5426..27b1a4a27 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, tdebase-dev, libkonq4-dev, 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), quilt, 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
 
diff --git a/debian/squeeze/tdewebdev/debian/control.in b/debian/squeeze/tdewebdev/debian/control.in
index 0712c3cef..70558c570 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, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs4-dev, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.7.2
 
 Package: tdewebdev
diff --git a/debian/wheezy/applications/abakus/debian/control.in b/debian/wheezy/applications/abakus/debian/control.in
index 76cddc997..fd553a9a1 100644
--- a/debian/wheezy/applications/abakus/debian/control.in
+++ b/debian/wheezy/applications/abakus/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 4.1.0), quilt, cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4
 
 Package: abakus-trinity
diff --git a/debian/wheezy/applications/adept/debian/control.in b/debian/wheezy/applications/adept/debian/control.in
index 88905f8bc..41a592b20 100644
--- a/debian/wheezy/applications/adept/debian/control.in
+++ b/debian/wheezy/applications/adept/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: adept-trinity
diff --git a/debian/wheezy/applications/digikam/debian/control.in b/debian/wheezy/applications/digikam/debian/control.in
index 0b3da427d..98165e514 100644
--- a/debian/wheezy/applications/digikam/debian/control.in
+++ b/debian/wheezy/applications/digikam/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-trinity-dev (>= 0.16),
diff --git a/debian/wheezy/applications/dolphin/debian/control.in b/debian/wheezy/applications/dolphin/debian/control.in
index db2383c42..84bfa7754 100644
--- a/debian/wheezy/applications/dolphin/debian/control.in
+++ b/debian/wheezy/applications/dolphin/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: dolphin-trinity
diff --git a/debian/wheezy/applications/k3b-i18n/debian/control b/debian/wheezy/applications/k3b-i18n/debian/control
index 8086e9390..3c7c3f0aa 100644
--- a/debian/wheezy/applications/k3b-i18n/debian/control
+++ b/debian/wheezy/applications/k3b-i18n/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 6), quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: tdelibs14-trinity-dev
 Standards-Version: 3.8.3
 
diff --git a/debian/wheezy/applications/kchmviewer/debian/control b/debian/wheezy/applications/kchmviewer/debian/control
index 64e1aa522..87b909adf 100644
--- a/debian/wheezy/applications/kchmviewer/debian/control
+++ b/debian/wheezy/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/debian/wheezy/applications/kerry/debian/control.in b/debian/wheezy/applications/kerry/debian/control.in
index 44a3e83a6..6e19d0e6c 100644
--- a/debian/wheezy/applications/kerry/debian/control.in
+++ b/debian/wheezy/applications/kerry/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.3
 
diff --git a/debian/wheezy/applications/kgtk-qt3/debian/control.in b/debian/wheezy/applications/kgtk-qt3/debian/control.in
index 41afcac0d..3227d5035 100644
--- a/debian/wheezy/applications/kgtk-qt3/debian/control.in
+++ b/debian/wheezy/applications/kgtk-qt3/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 7), cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
+Build-Depends: debhelper (>= 7), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/debian/wheezy/applications/knights/debian/control b/debian/wheezy/applications/knights/debian/control
index f3c011f12..9bbe55193 100644
--- a/debian/wheezy/applications/knights/debian/control
+++ b/debian/wheezy/applications/knights/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
 Uploaders: Ola Lundqvist <opal@debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, poxml-trinity, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, tdelibs14-trinity-dev, poxml-trinity, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://knights.sourceforge.net/
 
diff --git a/debian/wheezy/applications/koffice-i18n/debian/control b/debian/wheezy/applications/koffice-i18n/debian/control
index f3a2daee9..c3f0c49bb 100644
--- a/debian/wheezy/applications/koffice-i18n/debian/control
+++ b/debian/wheezy/applications/koffice-i18n/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Isaac Clerencia <isaac@debian.org>, Ben Burton <bab@debian.org>
 Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: debhelper (>= 5.0.0), quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.7.2
 
 Package: koffice-i18n-bg-trinity
diff --git a/debian/wheezy/applications/koffice/debian/control.in b/debian/wheezy/applications/koffice/debian/control.in
index 3e3d1cf11..7199c71e6 100644
--- a/debian/wheezy/applications/koffice/debian/control.in
+++ b/debian/wheezy/applications/koffice/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.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Build-Depends-Indep: qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 Homepage: http://www.koffice.org
diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/control.in b/debian/wheezy/applications/kpowersave.cmake/debian/control.in
index 93ddd1c0f..ce5a2530a 100644
--- a/debian/wheezy/applications/kpowersave.cmake/debian/control.in
+++ b/debian/wheezy/applications/kpowersave.cmake/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/debian/wheezy/applications/ksquirrel/debian/control b/debian/wheezy/applications/ksquirrel/debian/control
index 2c9b9b633..112bb3bf2 100644
--- a/debian/wheezy/applications/ksquirrel/debian/control
+++ b/debian/wheezy/applications/ksquirrel/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl>
 Build-Depends: debhelper (>= 5),
-               quilt,
+               cdbs, quilt,
                libksquirrel-trinity-dev,
                libkonq4-trinity-dev,
                kipi-plugins-trinity,
diff --git a/debian/wheezy/applications/ktechlab/debian/control b/debian/wheezy/applications/ktechlab/debian/control
index 85101cca6..e2fd0b2dd 100644
--- a/debian/wheezy/applications/ktechlab/debian/control
+++ b/debian/wheezy/applications/ktechlab/debian/control
@@ -2,7 +2,7 @@ Source: ktechlab-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 6.0.0), quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6.0.0), cdbs, quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktechlab-trinity
diff --git a/debian/wheezy/applications/ktorrent/debian/control.in b/debian/wheezy/applications/ktorrent/debian/control.in
index 1382f9320..6a6433dca 100644
--- a/debian/wheezy/applications/ktorrent/debian/control.in
+++ b/debian/wheezy/applications/ktorrent/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: ktorrent-trinity
diff --git a/debian/wheezy/applications/kuickshow/debian/control.in b/debian/wheezy/applications/kuickshow/debian/control.in
index babce6d11..b1c3bdfc5 100644
--- a/debian/wheezy/applications/kuickshow/debian/control.in
+++ b/debian/wheezy/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, tdelibs14-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, tdelibs14-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: kuickshow-trinity
diff --git a/debian/wheezy/applications/rosegarden/debian/control.in b/debian/wheezy/applications/rosegarden/debian/control.in
index b4cec817e..2ffe952e0 100644
--- a/debian/wheezy/applications/rosegarden/debian/control.in
+++ b/debian/wheezy/applications/rosegarden/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
+Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/debian/wheezy/applications/tde-style-lipstik/debian/control b/debian/wheezy/applications/tde-style-lipstik/debian/control
index 113a7ffdc..22ccdffd9 100644
--- a/debian/wheezy/applications/tde-style-lipstik/debian/control
+++ b/debian/wheezy/applications/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs14-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), cdbs, quilt, tdelibs14-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tde-style-lipstik-trinity
diff --git a/debian/wheezy/applications/tde-style-qtcurve/debian/control.in b/debian/wheezy/applications/tde-style-qtcurve/debian/control.in
index 1e634aa3c..a3e92a938 100644
--- a/debian/wheezy/applications/tde-style-qtcurve/debian/control.in
+++ b/debian/wheezy/applications/tde-style-qtcurve/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), tdelibs14-trinity-dev, cmake
+Build-Depends: debhelper (>= 5), quilt, tdelibs14-trinity-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: tde-style-qtcurve-trinity
diff --git a/debian/wheezy/applications/tdeio-locate/debian/control.in b/debian/wheezy/applications/tdeio-locate/debian/control.in
index d96185b40..1693e4f58 100644
--- a/debian/wheezy/applications/tdeio-locate/debian/control.in
+++ b/debian/wheezy/applications/tdeio-locate/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
 Standards-Version: 3.8.4
 
 Package: tdeio-locate-trinity
diff --git a/debian/wheezy/applications/wlassistant/debian/control.in b/debian/wheezy/applications/wlassistant/debian/control.in
index df9d5498b..ca673aa4b 100644
--- a/debian/wheezy/applications/wlassistant/debian/control.in
+++ b/debian/wheezy/applications/wlassistant/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 4.1.0), quilt, cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4
 
 Package: wlassistant-trinity
diff --git a/debian/wheezy/dependencies/arts/debian/control.in b/debian/wheezy/dependencies/arts/debian/control.in
index b9f79f602..893e3ac5b 100644
--- a/debian/wheezy/dependencies/arts/debian/control.in
+++ b/debian/wheezy/dependencies/arts/debian/control.in
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), autotools-dev,
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), quilt, autotools-dev,
  docbook-to-man, gawk, gettext, sharutils, texinfo,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev,
diff --git a/debian/wheezy/dependencies/libart-lgpl/debian/control.in b/debian/wheezy/dependencies/libart-lgpl/debian/control.in
index aa07e877f..e0b3f3a97 100644
--- a/debian/wheezy/dependencies/libart-lgpl/debian/control.in
+++ b/debian/wheezy/dependencies/libart-lgpl/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Josselin Mouette <joss@debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 5), quilt,
                gnome-pkg-tools (>= 0.7),
                cdbs,
                dpkg-dev (>= 1.13.19),
diff --git a/debian/wheezy/libraries/libkipi/debian/control.in b/debian/wheezy/libraries/libkipi/debian/control.in
index 351f29ef6..b56026751 100644
--- a/debian/wheezy/libraries/libkipi/debian/control.in
+++ b/debian/wheezy/libraries/libkipi/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
 Standards-Version: 3.8.3
 
 Package: libkipi0-trinity-dev
diff --git a/debian/wheezy/tdeaccessibility/debian/control.in b/debian/wheezy/tdeaccessibility/debian/control.in
index 70dea8a79..2108f844d 100644
--- a/debian/wheezy/tdeaccessibility/debian/control.in
+++ b/debian/wheezy/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, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, gettext, groff-base, tdelibs4-dev, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
 Standards-Version: 3.7.2
 
 Package: tdeaccessibility
diff --git a/debian/wheezy/tdeaddons/debian/control.in b/debian/wheezy/tdeaddons/debian/control.in
index 9b7f2b6f7..e227d9b99 100644
--- a/debian/wheezy/tdeaddons/debian/control.in
+++ b/debian/wheezy/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, 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
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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/wheezy/tdeadmin/debian/control.in b/debian/wheezy/tdeadmin/debian/control.in
index 8958b98e4..20ea38faa 100644
--- a/debian/wheezy/tdeadmin/debian/control.in
+++ b/debian/wheezy/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, libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, 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/wheezy/tdeartwork/debian/control.in b/debian/wheezy/tdeartwork/debian/control.in
index 4b914794e..3145180fb 100644
--- a/debian/wheezy/tdeartwork/debian/control.in
+++ b/debian/wheezy/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, gawk, gettext, sharutils, tdebase-dev, 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), quilt, 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/wheezy/tdebase/debian/control.in b/debian/wheezy/tdebase/debian/control.in
index c20726136..44f2c510a 100644
--- a/debian/wheezy/tdebase/debian/control.in
+++ b/debian/wheezy/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, 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), quilt, 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.8.4
diff --git a/debian/wheezy/tdeedu/debian/control.in b/debian/wheezy/tdeedu/debian/control.in
index 1e39e143a..25ff08c24 100644
--- a/debian/wheezy/tdeedu/debian/control.in
+++ b/debian/wheezy/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, 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), quilt, 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
diff --git a/debian/wheezy/tdegames/debian/control.in b/debian/wheezy/tdegames/debian/control.in
index e4d234b34..89ffd6f4f 100644
--- a/debian/wheezy/tdegames/debian/control.in
+++ b/debian/wheezy/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, automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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
 
diff --git a/debian/wheezy/tdegraphics/debian/control.in b/debian/wheezy/tdegraphics/debian/control.in
index a34ac5090..88b71b09b 100644
--- a/debian/wheezy/tdegraphics/debian/control.in
+++ b/debian/wheezy/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, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
 Package: tdegraphics
diff --git a/debian/wheezy/tdelibs/debian/control.in b/debian/wheezy/tdelibs/debian/control.in
index 43f0657aa..2589b9e94 100644
--- a/debian/wheezy/tdelibs/debian/control.in
+++ b/debian/wheezy/tdelibs/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.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
diff --git a/debian/wheezy/tdemultimedia/debian/control.in b/debian/wheezy/tdemultimedia/debian/control.in
index f79201647..0fb3e254a 100644
--- a/debian/wheezy/tdemultimedia/debian/control.in
+++ b/debian/wheezy/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, 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), quilt, 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
diff --git a/debian/wheezy/tdenetwork/debian/control.in b/debian/wheezy/tdenetwork/debian/control.in
index 3c9f904e6..0c14b82f5 100644
--- a/debian/wheezy/tdenetwork/debian/control.in
+++ b/debian/wheezy/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, libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff-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), quilt, 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, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: tdenetwork
diff --git a/debian/wheezy/tdepim/debian/control.in b/debian/wheezy/tdepim/debian/control.in
index ab6e20fa4..bab9b686d 100644
--- a/debian/wheezy/tdepim/debian/control.in
+++ b/debian/wheezy/tdepim/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), automake1.9,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9,
  cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
diff --git a/debian/wheezy/tdesdk/debian/control.in b/debian/wheezy/tdesdk/debian/control.in
index da3e8d50a..8185ba206 100644
--- a/debian/wheezy/tdesdk/debian/control.in
+++ b/debian/wheezy/tdesdk/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,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk,
  gettext, pkg-config, tdelibs4-dev, binutils-dev, bison, flex,
  tdepim-dev, libapr1-dev, libkcal2-dev,
  libktnef1-dev, libsvn-dev
diff --git a/debian/wheezy/tdetoys/debian/control.in b/debian/wheezy/tdetoys/debian/control.in
index 5fb46a280..62da248a9 100644
--- a/debian/wheezy/tdetoys/debian/control.in
+++ b/debian/wheezy/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, gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, tdelibs4-dev, gawk, gettext, sharutils
 Standards-Version: 3.7.2
 
 Package: tdetoys
diff --git a/debian/wheezy/tdeutils/debian/control.in b/debian/wheezy/tdeutils/debian/control.in
index c922d5426..27b1a4a27 100644
--- a/debian/wheezy/tdeutils/debian/control.in
+++ b/debian/wheezy/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, tdebase-dev, libkonq4-dev, 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), quilt, 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
 
diff --git a/debian/wheezy/tdewebdev/debian/control.in b/debian/wheezy/tdewebdev/debian/control.in
index 0712c3cef..70558c570 100644
--- a/debian/wheezy/tdewebdev/debian/control.in
+++ b/debian/wheezy/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, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs4-dev, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.7.2
 
 Package: tdewebdev
diff --git a/ubuntu/maverick/applications/abakus/debian/control.in b/ubuntu/maverick/applications/abakus/debian/control.in
index 76cddc997..fd553a9a1 100644
--- a/ubuntu/maverick/applications/abakus/debian/control.in
+++ b/ubuntu/maverick/applications/abakus/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 4.1.0), quilt, cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4
 
 Package: abakus-trinity
diff --git a/ubuntu/maverick/applications/adept/debian/control.in b/ubuntu/maverick/applications/adept/debian/control.in
index 88905f8bc..41a592b20 100644
--- a/ubuntu/maverick/applications/adept/debian/control.in
+++ b/ubuntu/maverick/applications/adept/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: adept-trinity
diff --git a/ubuntu/maverick/applications/digikam/debian/control.in b/ubuntu/maverick/applications/digikam/debian/control.in
index 0b3da427d..98165e514 100644
--- a/ubuntu/maverick/applications/digikam/debian/control.in
+++ b/ubuntu/maverick/applications/digikam/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-trinity-dev (>= 0.16),
diff --git a/ubuntu/maverick/applications/dolphin/debian/control.in b/ubuntu/maverick/applications/dolphin/debian/control.in
index db2383c42..84bfa7754 100644
--- a/ubuntu/maverick/applications/dolphin/debian/control.in
+++ b/ubuntu/maverick/applications/dolphin/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: dolphin-trinity
diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/control b/ubuntu/maverick/applications/k3b-i18n/debian/control
index 8086e9390..3c7c3f0aa 100644
--- a/ubuntu/maverick/applications/k3b-i18n/debian/control
+++ b/ubuntu/maverick/applications/k3b-i18n/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 6), quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: tdelibs14-trinity-dev
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/control b/ubuntu/maverick/applications/kchmviewer/debian/control
index cb7710c8c..4208a4601 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/control
+++ b/ubuntu/maverick/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/ubuntu/maverick/applications/kerry/debian/control.in b/ubuntu/maverick/applications/kerry/debian/control.in
index 44a3e83a6..6e19d0e6c 100644
--- a/ubuntu/maverick/applications/kerry/debian/control.in
+++ b/ubuntu/maverick/applications/kerry/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/control.in b/ubuntu/maverick/applications/kgtk-qt3/debian/control.in
index 41afcac0d..3227d5035 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/control.in
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 7), cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
+Build-Depends: debhelper (>= 7), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/ubuntu/maverick/applications/knights/debian/control b/ubuntu/maverick/applications/knights/debian/control
index cf4856b90..dcbe7d60a 100644
--- a/ubuntu/maverick/applications/knights/debian/control
+++ b/ubuntu/maverick/applications/knights/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
 Uploaders: Ola Lundqvist <opal@debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, poxml-trinity, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, tdelibs14-trinity-dev, poxml-trinity, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://knights.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/koffice-i18n/debian/control b/ubuntu/maverick/applications/koffice-i18n/debian/control
index f3a2daee9..c3f0c49bb 100644
--- a/ubuntu/maverick/applications/koffice-i18n/debian/control
+++ b/ubuntu/maverick/applications/koffice-i18n/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Isaac Clerencia <isaac@debian.org>, Ben Burton <bab@debian.org>
 Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: debhelper (>= 5.0.0), quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.7.2
 
 Package: koffice-i18n-bg-trinity
diff --git a/ubuntu/maverick/applications/koffice/debian/control.in b/ubuntu/maverick/applications/koffice/debian/control.in
index 3e3d1cf11..7199c71e6 100644
--- a/ubuntu/maverick/applications/koffice/debian/control.in
+++ b/ubuntu/maverick/applications/koffice/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.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Build-Depends-Indep: qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 Homepage: http://www.koffice.org
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/control.in b/ubuntu/maverick/applications/kpowersave.cmake/debian/control.in
index 93ddd1c0f..ce5a2530a 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/control.in
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/control b/ubuntu/maverick/applications/ksquirrel/debian/control
index 766a956be..65cc1d125 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/control
+++ b/ubuntu/maverick/applications/ksquirrel/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl>
 Build-Depends: debhelper (>= 5),
-               quilt,
+               cdbs, quilt,
                libksquirrel-trinity-dev,
                libkonq4-trinity-dev,
                kipi-plugins-trinity,
diff --git a/ubuntu/maverick/applications/ktechlab/debian/control b/ubuntu/maverick/applications/ktechlab/debian/control
index 0537629ce..2fbbd2e04 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/control
+++ b/ubuntu/maverick/applications/ktechlab/debian/control
@@ -2,7 +2,7 @@ Source: ktechlab-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 6.0.0), quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6.0.0), cdbs, quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktechlab-trinity
diff --git a/ubuntu/maverick/applications/ktorrent/debian/control.in b/ubuntu/maverick/applications/ktorrent/debian/control.in
index 1382f9320..6a6433dca 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/control.in
+++ b/ubuntu/maverick/applications/ktorrent/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: ktorrent-trinity
diff --git a/ubuntu/maverick/applications/kuickshow/debian/control.in b/ubuntu/maverick/applications/kuickshow/debian/control.in
index babce6d11..b1c3bdfc5 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, tdelibs14-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, tdelibs14-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/rosegarden/debian/control.in b/ubuntu/maverick/applications/rosegarden/debian/control.in
index b4cec817e..2ffe952e0 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/control.in
+++ b/ubuntu/maverick/applications/rosegarden/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
+Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/control b/ubuntu/maverick/applications/tde-style-lipstik/debian/control
index 69e16a263..11d5c5357 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/control
+++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs14-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), cdbs, quilt, tdelibs14-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tde-style-lipstik-trinity
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control.in b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control.in
index 1e634aa3c..a3e92a938 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control.in
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), tdelibs14-trinity-dev, cmake
+Build-Depends: debhelper (>= 5), quilt, tdelibs14-trinity-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: tde-style-qtcurve-trinity
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/control.in b/ubuntu/maverick/applications/tdeio-locate/debian/control.in
index d96185b40..1693e4f58 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/control.in
+++ b/ubuntu/maverick/applications/tdeio-locate/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
 Standards-Version: 3.8.4
 
 Package: tdeio-locate-trinity
diff --git a/ubuntu/maverick/applications/wlassistant/debian/control.in b/ubuntu/maverick/applications/wlassistant/debian/control.in
index df9d5498b..ca673aa4b 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/control.in
+++ b/ubuntu/maverick/applications/wlassistant/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 4.1.0), quilt, cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4
 
 Package: wlassistant-trinity
diff --git a/ubuntu/maverick/dependencies/arts/debian/control.in b/ubuntu/maverick/dependencies/arts/debian/control.in
index b9f79f602..893e3ac5b 100644
--- a/ubuntu/maverick/dependencies/arts/debian/control.in
+++ b/ubuntu/maverick/dependencies/arts/debian/control.in
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), autotools-dev,
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), quilt, autotools-dev,
  docbook-to-man, gawk, gettext, sharutils, texinfo,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev,
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in b/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in
index 12f7ab436..4dc153450 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in
+++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Josselin Mouette <joss@debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 5), quilt,
                gnome-pkg-tools (>= 0.7),
                cdbs,
                dpkg-dev (>= 1.13.19),
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/control.in b/ubuntu/maverick/kdegraphics.automake/debian/control.in
index 04be0434c..e5a1beb03 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, 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), quilt, 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
diff --git a/ubuntu/maverick/libraries/libkipi/debian/control.in b/ubuntu/maverick/libraries/libkipi/debian/control.in
index 351f29ef6..b56026751 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/control.in
+++ b/ubuntu/maverick/libraries/libkipi/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
 Standards-Version: 3.8.3
 
 Package: libkipi0-trinity-dev
diff --git a/ubuntu/maverick/tdeaccessibility/debian/control.in b/ubuntu/maverick/tdeaccessibility/debian/control.in
index 70dea8a79..2108f844d 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, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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/tdeaddons/debian/control.in b/ubuntu/maverick/tdeaddons/debian/control.in
index 9b7f2b6f7..e227d9b99 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, 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
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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.in b/ubuntu/maverick/tdeadmin/debian/control.in
index 8958b98e4..20ea38faa 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, libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, 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 4b914794e..3145180fb 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, gawk, gettext, sharutils, tdebase-dev, 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), quilt, 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.in b/ubuntu/maverick/tdebase/debian/control.in
index f135cbfd7..7ce1820cc 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, libdbus-qt-1-dev (>= 0.60), libldap2-dev, 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), quilt, autotools-dev, gawk, gettext, tdelibs4-dev, libdbus-qt-1-dev (>= 0.60), libldap2-dev, 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.8.4
diff --git a/ubuntu/maverick/tdeedu/debian/control.in b/ubuntu/maverick/tdeedu/debian/control.in
index 1e39e143a..25ff08c24 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, 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), quilt, 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
diff --git a/ubuntu/maverick/tdegames/debian/control.in b/ubuntu/maverick/tdegames/debian/control.in
index e4d234b34..89ffd6f4f 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, automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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
 
diff --git a/ubuntu/maverick/tdegraphics/debian/control.in b/ubuntu/maverick/tdegraphics/debian/control.in
index a34ac5090..88b71b09b 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, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
 Package: tdegraphics
diff --git a/ubuntu/maverick/tdelibs/debian/control.in b/ubuntu/maverick/tdelibs/debian/control.in
index 43f0657aa..2589b9e94 100644
--- a/ubuntu/maverick/tdelibs/debian/control.in
+++ b/ubuntu/maverick/tdelibs/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.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
diff --git a/ubuntu/maverick/tdemultimedia/debian/control.in b/ubuntu/maverick/tdemultimedia/debian/control.in
index f79201647..0fb3e254a 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, 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), quilt, 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
diff --git a/ubuntu/maverick/tdenetwork/debian/control.in b/ubuntu/maverick/tdenetwork/debian/control.in
index 3c9f904e6..0c14b82f5 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, libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff-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), quilt, 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, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: tdenetwork
diff --git a/ubuntu/maverick/tdepim/debian/control.in b/ubuntu/maverick/tdepim/debian/control.in
index ab6e20fa4..bab9b686d 100644
--- a/ubuntu/maverick/tdepim/debian/control.in
+++ b/ubuntu/maverick/tdepim/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), automake1.9,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9,
  cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
diff --git a/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in
index da3e8d50a..8185ba206 100644
--- a/ubuntu/maverick/tdesdk/debian/control.in
+++ b/ubuntu/maverick/tdesdk/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,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk,
  gettext, pkg-config, tdelibs4-dev, binutils-dev, bison, flex,
  tdepim-dev, libapr1-dev, libkcal2-dev,
  libktnef1-dev, libsvn-dev
diff --git a/ubuntu/maverick/tdetoys/debian/control.in b/ubuntu/maverick/tdetoys/debian/control.in
index 5fb46a280..62da248a9 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, gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, tdelibs4-dev, gawk, gettext, sharutils
 Standards-Version: 3.7.2
 
 Package: tdetoys
diff --git a/ubuntu/maverick/tdeutils/debian/control.in b/ubuntu/maverick/tdeutils/debian/control.in
index c922d5426..27b1a4a27 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, tdebase-dev, libkonq4-dev, 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), quilt, 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
 
diff --git a/ubuntu/maverick/tdewebdev/debian/control.in b/ubuntu/maverick/tdewebdev/debian/control.in
index 0712c3cef..70558c570 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, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs4-dev, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.7.2
 
 Package: tdewebdev
diff --git a/ubuntu/precise/applications/abakus/debian/control.in b/ubuntu/precise/applications/abakus/debian/control.in
index 76cddc997..fd553a9a1 100644
--- a/ubuntu/precise/applications/abakus/debian/control.in
+++ b/ubuntu/precise/applications/abakus/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 4.1.0), quilt, cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4
 
 Package: abakus-trinity
diff --git a/ubuntu/precise/applications/adept/debian/control.in b/ubuntu/precise/applications/adept/debian/control.in
index 88905f8bc..41a592b20 100644
--- a/ubuntu/precise/applications/adept/debian/control.in
+++ b/ubuntu/precise/applications/adept/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: adept-trinity
diff --git a/ubuntu/precise/applications/digikam/debian/control.in b/ubuntu/precise/applications/digikam/debian/control.in
index 0b3da427d..98165e514 100644
--- a/ubuntu/precise/applications/digikam/debian/control.in
+++ b/ubuntu/precise/applications/digikam/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-trinity-dev (>= 0.16),
diff --git a/ubuntu/precise/applications/dolphin/debian/control.in b/ubuntu/precise/applications/dolphin/debian/control.in
index db2383c42..84bfa7754 100644
--- a/ubuntu/precise/applications/dolphin/debian/control.in
+++ b/ubuntu/precise/applications/dolphin/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: dolphin-trinity
diff --git a/ubuntu/precise/applications/k3b-i18n/debian/control b/ubuntu/precise/applications/k3b-i18n/debian/control
index 8086e9390..3c7c3f0aa 100644
--- a/ubuntu/precise/applications/k3b-i18n/debian/control
+++ b/ubuntu/precise/applications/k3b-i18n/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 6), quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: tdelibs14-trinity-dev
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/precise/applications/kchmviewer/debian/control b/ubuntu/precise/applications/kchmviewer/debian/control
index cb7710c8c..4208a4601 100644
--- a/ubuntu/precise/applications/kchmviewer/debian/control
+++ b/ubuntu/precise/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/ubuntu/precise/applications/kerry/debian/control.in b/ubuntu/precise/applications/kerry/debian/control.in
index 44a3e83a6..6e19d0e6c 100644
--- a/ubuntu/precise/applications/kerry/debian/control.in
+++ b/ubuntu/precise/applications/kerry/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/precise/applications/kgtk-qt3/debian/control.in b/ubuntu/precise/applications/kgtk-qt3/debian/control.in
index 41afcac0d..3227d5035 100644
--- a/ubuntu/precise/applications/kgtk-qt3/debian/control.in
+++ b/ubuntu/precise/applications/kgtk-qt3/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 7), cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
+Build-Depends: debhelper (>= 7), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/ubuntu/precise/applications/knights/debian/control b/ubuntu/precise/applications/knights/debian/control
index cf4856b90..dcbe7d60a 100644
--- a/ubuntu/precise/applications/knights/debian/control
+++ b/ubuntu/precise/applications/knights/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
 Uploaders: Ola Lundqvist <opal@debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, poxml-trinity, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, tdelibs14-trinity-dev, poxml-trinity, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://knights.sourceforge.net/
 
diff --git a/ubuntu/precise/applications/koffice-i18n/debian/control b/ubuntu/precise/applications/koffice-i18n/debian/control
index f3a2daee9..c3f0c49bb 100644
--- a/ubuntu/precise/applications/koffice-i18n/debian/control
+++ b/ubuntu/precise/applications/koffice-i18n/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Isaac Clerencia <isaac@debian.org>, Ben Burton <bab@debian.org>
 Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: debhelper (>= 5.0.0), quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.7.2
 
 Package: koffice-i18n-bg-trinity
diff --git a/ubuntu/precise/applications/koffice/debian/control.in b/ubuntu/precise/applications/koffice/debian/control.in
index 3e3d1cf11..7199c71e6 100644
--- a/ubuntu/precise/applications/koffice/debian/control.in
+++ b/ubuntu/precise/applications/koffice/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.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Build-Depends-Indep: qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 Homepage: http://www.koffice.org
diff --git a/ubuntu/precise/applications/kpowersave.cmake/debian/control.in b/ubuntu/precise/applications/kpowersave.cmake/debian/control.in
index 93ddd1c0f..ce5a2530a 100644
--- a/ubuntu/precise/applications/kpowersave.cmake/debian/control.in
+++ b/ubuntu/precise/applications/kpowersave.cmake/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/ubuntu/precise/applications/ksquirrel/debian/control b/ubuntu/precise/applications/ksquirrel/debian/control
index 766a956be..65cc1d125 100644
--- a/ubuntu/precise/applications/ksquirrel/debian/control
+++ b/ubuntu/precise/applications/ksquirrel/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl>
 Build-Depends: debhelper (>= 5),
-               quilt,
+               cdbs, quilt,
                libksquirrel-trinity-dev,
                libkonq4-trinity-dev,
                kipi-plugins-trinity,
diff --git a/ubuntu/precise/applications/ktechlab/debian/control b/ubuntu/precise/applications/ktechlab/debian/control
index 0537629ce..2fbbd2e04 100644
--- a/ubuntu/precise/applications/ktechlab/debian/control
+++ b/ubuntu/precise/applications/ktechlab/debian/control
@@ -2,7 +2,7 @@ Source: ktechlab-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 6.0.0), quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6.0.0), cdbs, quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktechlab-trinity
diff --git a/ubuntu/precise/applications/ktorrent/debian/control.in b/ubuntu/precise/applications/ktorrent/debian/control.in
index 1382f9320..6a6433dca 100644
--- a/ubuntu/precise/applications/ktorrent/debian/control.in
+++ b/ubuntu/precise/applications/ktorrent/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: ktorrent-trinity
diff --git a/ubuntu/precise/applications/kuickshow/debian/control.in b/ubuntu/precise/applications/kuickshow/debian/control.in
index babce6d11..b1c3bdfc5 100644
--- a/ubuntu/precise/applications/kuickshow/debian/control.in
+++ b/ubuntu/precise/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, tdelibs14-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, tdelibs14-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: kuickshow-trinity
diff --git a/ubuntu/precise/applications/rosegarden/debian/control.in b/ubuntu/precise/applications/rosegarden/debian/control.in
index b4cec817e..2ffe952e0 100644
--- a/ubuntu/precise/applications/rosegarden/debian/control.in
+++ b/ubuntu/precise/applications/rosegarden/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
+Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/ubuntu/precise/applications/tde-style-lipstik/debian/control b/ubuntu/precise/applications/tde-style-lipstik/debian/control
index 69e16a263..11d5c5357 100644
--- a/ubuntu/precise/applications/tde-style-lipstik/debian/control
+++ b/ubuntu/precise/applications/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs14-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), cdbs, quilt, tdelibs14-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tde-style-lipstik-trinity
diff --git a/ubuntu/precise/applications/tde-style-qtcurve/debian/control.in b/ubuntu/precise/applications/tde-style-qtcurve/debian/control.in
index 1e634aa3c..a3e92a938 100644
--- a/ubuntu/precise/applications/tde-style-qtcurve/debian/control.in
+++ b/ubuntu/precise/applications/tde-style-qtcurve/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), tdelibs14-trinity-dev, cmake
+Build-Depends: debhelper (>= 5), quilt, tdelibs14-trinity-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: tde-style-qtcurve-trinity
diff --git a/ubuntu/precise/applications/tdeio-locate/debian/control.in b/ubuntu/precise/applications/tdeio-locate/debian/control.in
index d96185b40..1693e4f58 100644
--- a/ubuntu/precise/applications/tdeio-locate/debian/control.in
+++ b/ubuntu/precise/applications/tdeio-locate/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
 Standards-Version: 3.8.4
 
 Package: tdeio-locate-trinity
diff --git a/ubuntu/precise/applications/wlassistant/debian/control.in b/ubuntu/precise/applications/wlassistant/debian/control.in
index df9d5498b..ca673aa4b 100644
--- a/ubuntu/precise/applications/wlassistant/debian/control.in
+++ b/ubuntu/precise/applications/wlassistant/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 4.1.0), quilt, cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4
 
 Package: wlassistant-trinity
diff --git a/ubuntu/precise/dependencies/arts/debian/control.in b/ubuntu/precise/dependencies/arts/debian/control.in
index b9f79f602..893e3ac5b 100644
--- a/ubuntu/precise/dependencies/arts/debian/control.in
+++ b/ubuntu/precise/dependencies/arts/debian/control.in
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), autotools-dev,
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), quilt, autotools-dev,
  docbook-to-man, gawk, gettext, sharutils, texinfo,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev,
diff --git a/ubuntu/precise/dependencies/libart-lgpl/debian/control.in b/ubuntu/precise/dependencies/libart-lgpl/debian/control.in
index aa07e877f..e0b3f3a97 100644
--- a/ubuntu/precise/dependencies/libart-lgpl/debian/control.in
+++ b/ubuntu/precise/dependencies/libart-lgpl/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Josselin Mouette <joss@debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 5), quilt,
                gnome-pkg-tools (>= 0.7),
                cdbs,
                dpkg-dev (>= 1.13.19),
diff --git a/ubuntu/precise/kdegraphics.automake/debian/control.in b/ubuntu/precise/kdegraphics.automake/debian/control.in
index 04be0434c..e5a1beb03 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/control.in
+++ b/ubuntu/precise/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, 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), quilt, 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
diff --git a/ubuntu/precise/libraries/libkipi/debian/control.in b/ubuntu/precise/libraries/libkipi/debian/control.in
index 351f29ef6..b56026751 100644
--- a/ubuntu/precise/libraries/libkipi/debian/control.in
+++ b/ubuntu/precise/libraries/libkipi/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
 Standards-Version: 3.8.3
 
 Package: libkipi0-trinity-dev
diff --git a/ubuntu/precise/tdeaccessibility/debian/control.in b/ubuntu/precise/tdeaccessibility/debian/control.in
index 70dea8a79..2108f844d 100644
--- a/ubuntu/precise/tdeaccessibility/debian/control.in
+++ b/ubuntu/precise/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, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, gettext, groff-base, tdelibs4-dev, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
 Standards-Version: 3.7.2
 
 Package: tdeaccessibility
diff --git a/ubuntu/precise/tdeaddons/debian/control.in b/ubuntu/precise/tdeaddons/debian/control.in
index 9b7f2b6f7..e227d9b99 100644
--- a/ubuntu/precise/tdeaddons/debian/control.in
+++ b/ubuntu/precise/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, 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
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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/precise/tdeadmin/debian/control.in b/ubuntu/precise/tdeadmin/debian/control.in
index 8958b98e4..20ea38faa 100644
--- a/ubuntu/precise/tdeadmin/debian/control.in
+++ b/ubuntu/precise/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, libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, 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/precise/tdeartwork/debian/control.in b/ubuntu/precise/tdeartwork/debian/control.in
index 4b914794e..3145180fb 100644
--- a/ubuntu/precise/tdeartwork/debian/control.in
+++ b/ubuntu/precise/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, gawk, gettext, sharutils, tdebase-dev, 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), quilt, 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/precise/tdebase/debian/control.in b/ubuntu/precise/tdebase/debian/control.in
index f135cbfd7..7ce1820cc 100644
--- a/ubuntu/precise/tdebase/debian/control.in
+++ b/ubuntu/precise/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, libdbus-qt-1-dev (>= 0.60), libldap2-dev, 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), quilt, autotools-dev, gawk, gettext, tdelibs4-dev, libdbus-qt-1-dev (>= 0.60), libldap2-dev, 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.8.4
diff --git a/ubuntu/precise/tdeedu/debian/control.in b/ubuntu/precise/tdeedu/debian/control.in
index 1e39e143a..25ff08c24 100644
--- a/ubuntu/precise/tdeedu/debian/control.in
+++ b/ubuntu/precise/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, 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), quilt, 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
diff --git a/ubuntu/precise/tdegames/debian/control.in b/ubuntu/precise/tdegames/debian/control.in
index e4d234b34..89ffd6f4f 100644
--- a/ubuntu/precise/tdegames/debian/control.in
+++ b/ubuntu/precise/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, automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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
 
diff --git a/ubuntu/precise/tdegraphics/debian/control.in b/ubuntu/precise/tdegraphics/debian/control.in
index a34ac5090..88b71b09b 100644
--- a/ubuntu/precise/tdegraphics/debian/control.in
+++ b/ubuntu/precise/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, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
 Package: tdegraphics
diff --git a/ubuntu/precise/tdelibs/debian/control.in b/ubuntu/precise/tdelibs/debian/control.in
index 43f0657aa..2589b9e94 100644
--- a/ubuntu/precise/tdelibs/debian/control.in
+++ b/ubuntu/precise/tdelibs/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.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
diff --git a/ubuntu/precise/tdemultimedia/debian/control.in b/ubuntu/precise/tdemultimedia/debian/control.in
index f79201647..0fb3e254a 100644
--- a/ubuntu/precise/tdemultimedia/debian/control.in
+++ b/ubuntu/precise/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, 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), quilt, 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
diff --git a/ubuntu/precise/tdenetwork/debian/control.in b/ubuntu/precise/tdenetwork/debian/control.in
index 3c9f904e6..0c14b82f5 100644
--- a/ubuntu/precise/tdenetwork/debian/control.in
+++ b/ubuntu/precise/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, libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff-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), quilt, 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, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: tdenetwork
diff --git a/ubuntu/precise/tdepim/debian/control.in b/ubuntu/precise/tdepim/debian/control.in
index ab6e20fa4..bab9b686d 100644
--- a/ubuntu/precise/tdepim/debian/control.in
+++ b/ubuntu/precise/tdepim/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), automake1.9,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9,
  cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
diff --git a/ubuntu/precise/tdesdk/debian/control.in b/ubuntu/precise/tdesdk/debian/control.in
index da3e8d50a..8185ba206 100644
--- a/ubuntu/precise/tdesdk/debian/control.in
+++ b/ubuntu/precise/tdesdk/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,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk,
  gettext, pkg-config, tdelibs4-dev, binutils-dev, bison, flex,
  tdepim-dev, libapr1-dev, libkcal2-dev,
  libktnef1-dev, libsvn-dev
diff --git a/ubuntu/precise/tdetoys/debian/control.in b/ubuntu/precise/tdetoys/debian/control.in
index 5fb46a280..62da248a9 100644
--- a/ubuntu/precise/tdetoys/debian/control.in
+++ b/ubuntu/precise/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, gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, tdelibs4-dev, gawk, gettext, sharutils
 Standards-Version: 3.7.2
 
 Package: tdetoys
diff --git a/ubuntu/precise/tdeutils/debian/control.in b/ubuntu/precise/tdeutils/debian/control.in
index c922d5426..27b1a4a27 100644
--- a/ubuntu/precise/tdeutils/debian/control.in
+++ b/ubuntu/precise/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, tdebase-dev, libkonq4-dev, 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), quilt, 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
 
diff --git a/ubuntu/precise/tdewebdev/debian/control.in b/ubuntu/precise/tdewebdev/debian/control.in
index 0712c3cef..70558c570 100644
--- a/ubuntu/precise/tdewebdev/debian/control.in
+++ b/ubuntu/precise/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, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs4-dev, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.7.2
 
 Package: tdewebdev
diff --git a/ubuntu/raring/applications/abakus/debian/control.in b/ubuntu/raring/applications/abakus/debian/control.in
index 76cddc997..fd553a9a1 100644
--- a/ubuntu/raring/applications/abakus/debian/control.in
+++ b/ubuntu/raring/applications/abakus/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 4.1.0), quilt, cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4
 
 Package: abakus-trinity
diff --git a/ubuntu/raring/applications/adept/debian/control.in b/ubuntu/raring/applications/adept/debian/control.in
index 88905f8bc..41a592b20 100644
--- a/ubuntu/raring/applications/adept/debian/control.in
+++ b/ubuntu/raring/applications/adept/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: adept-trinity
diff --git a/ubuntu/raring/applications/digikam/debian/control.in b/ubuntu/raring/applications/digikam/debian/control.in
index 0b3da427d..98165e514 100644
--- a/ubuntu/raring/applications/digikam/debian/control.in
+++ b/ubuntu/raring/applications/digikam/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-trinity-dev (>= 0.16),
diff --git a/ubuntu/raring/applications/dolphin/debian/control.in b/ubuntu/raring/applications/dolphin/debian/control.in
index db2383c42..84bfa7754 100644
--- a/ubuntu/raring/applications/dolphin/debian/control.in
+++ b/ubuntu/raring/applications/dolphin/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: dolphin-trinity
diff --git a/ubuntu/raring/applications/k3b-i18n/debian/control b/ubuntu/raring/applications/k3b-i18n/debian/control
index 8086e9390..3c7c3f0aa 100644
--- a/ubuntu/raring/applications/k3b-i18n/debian/control
+++ b/ubuntu/raring/applications/k3b-i18n/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 6), quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: tdelibs14-trinity-dev
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/raring/applications/kchmviewer/debian/control b/ubuntu/raring/applications/kchmviewer/debian/control
index cb7710c8c..4208a4601 100644
--- a/ubuntu/raring/applications/kchmviewer/debian/control
+++ b/ubuntu/raring/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, tdelibs14-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/ubuntu/raring/applications/kerry/debian/control.in b/ubuntu/raring/applications/kerry/debian/control.in
index 44a3e83a6..6e19d0e6c 100644
--- a/ubuntu/raring/applications/kerry/debian/control.in
+++ b/ubuntu/raring/applications/kerry/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/raring/applications/kgtk-qt3/debian/control.in b/ubuntu/raring/applications/kgtk-qt3/debian/control.in
index 41afcac0d..3227d5035 100644
--- a/ubuntu/raring/applications/kgtk-qt3/debian/control.in
+++ b/ubuntu/raring/applications/kgtk-qt3/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 7), cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
+Build-Depends: debhelper (>= 7), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/ubuntu/raring/applications/knights/debian/control b/ubuntu/raring/applications/knights/debian/control
index cf4856b90..dcbe7d60a 100644
--- a/ubuntu/raring/applications/knights/debian/control
+++ b/ubuntu/raring/applications/knights/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
 Uploaders: Ola Lundqvist <opal@debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, poxml-trinity, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, tdelibs14-trinity-dev, poxml-trinity, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://knights.sourceforge.net/
 
diff --git a/ubuntu/raring/applications/koffice-i18n/debian/control b/ubuntu/raring/applications/koffice-i18n/debian/control
index f3a2daee9..c3f0c49bb 100644
--- a/ubuntu/raring/applications/koffice-i18n/debian/control
+++ b/ubuntu/raring/applications/koffice-i18n/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Isaac Clerencia <isaac@debian.org>, Ben Burton <bab@debian.org>
 Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: debhelper (>= 5.0.0), quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.7.2
 
 Package: koffice-i18n-bg-trinity
diff --git a/ubuntu/raring/applications/koffice/debian/control.in b/ubuntu/raring/applications/koffice/debian/control.in
index 3e3d1cf11..7199c71e6 100644
--- a/ubuntu/raring/applications/koffice/debian/control.in
+++ b/ubuntu/raring/applications/koffice/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.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Build-Depends-Indep: qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 Homepage: http://www.koffice.org
diff --git a/ubuntu/raring/applications/kpowersave.cmake/debian/control.in b/ubuntu/raring/applications/kpowersave.cmake/debian/control.in
index 93ddd1c0f..ce5a2530a 100644
--- a/ubuntu/raring/applications/kpowersave.cmake/debian/control.in
+++ b/ubuntu/raring/applications/kpowersave.cmake/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-qt-1-dev (>= 0.6), libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/ubuntu/raring/applications/ksquirrel/debian/control b/ubuntu/raring/applications/ksquirrel/debian/control
index 766a956be..65cc1d125 100644
--- a/ubuntu/raring/applications/ksquirrel/debian/control
+++ b/ubuntu/raring/applications/ksquirrel/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl>
 Build-Depends: debhelper (>= 5),
-               quilt,
+               cdbs, quilt,
                libksquirrel-trinity-dev,
                libkonq4-trinity-dev,
                kipi-plugins-trinity,
diff --git a/ubuntu/raring/applications/ktechlab/debian/control b/ubuntu/raring/applications/ktechlab/debian/control
index 0537629ce..2fbbd2e04 100644
--- a/ubuntu/raring/applications/ktechlab/debian/control
+++ b/ubuntu/raring/applications/ktechlab/debian/control
@@ -2,7 +2,7 @@ Source: ktechlab-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 6.0.0), quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6.0.0), cdbs, quilt, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktechlab-trinity
diff --git a/ubuntu/raring/applications/ktorrent/debian/control.in b/ubuntu/raring/applications/ktorrent/debian/control.in
index 1382f9320..6a6433dca 100644
--- a/ubuntu/raring/applications/ktorrent/debian/control.in
+++ b/ubuntu/raring/applications/ktorrent/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: ktorrent-trinity
diff --git a/ubuntu/raring/applications/kuickshow/debian/control.in b/ubuntu/raring/applications/kuickshow/debian/control.in
index babce6d11..b1c3bdfc5 100644
--- a/ubuntu/raring/applications/kuickshow/debian/control.in
+++ b/ubuntu/raring/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, tdelibs14-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, tdelibs14-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 
 Package: kuickshow-trinity
diff --git a/ubuntu/raring/applications/rosegarden/debian/control.in b/ubuntu/raring/applications/rosegarden/debian/control.in
index b4cec817e..2ffe952e0 100644
--- a/ubuntu/raring/applications/rosegarden/debian/control.in
+++ b/ubuntu/raring/applications/rosegarden/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
+Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/ubuntu/raring/applications/tde-style-lipstik/debian/control b/ubuntu/raring/applications/tde-style-lipstik/debian/control
index 69e16a263..11d5c5357 100644
--- a/ubuntu/raring/applications/tde-style-lipstik/debian/control
+++ b/ubuntu/raring/applications/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs14-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), cdbs, quilt, tdelibs14-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tde-style-lipstik-trinity
diff --git a/ubuntu/raring/applications/tde-style-qtcurve/debian/control.in b/ubuntu/raring/applications/tde-style-qtcurve/debian/control.in
index 1e634aa3c..a3e92a938 100644
--- a/ubuntu/raring/applications/tde-style-qtcurve/debian/control.in
+++ b/ubuntu/raring/applications/tde-style-qtcurve/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), tdelibs14-trinity-dev, cmake
+Build-Depends: debhelper (>= 5), quilt, tdelibs14-trinity-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: tde-style-qtcurve-trinity
diff --git a/ubuntu/raring/applications/tdeio-locate/debian/control.in b/ubuntu/raring/applications/tdeio-locate/debian/control.in
index d96185b40..1693e4f58 100644
--- a/ubuntu/raring/applications/tdeio-locate/debian/control.in
+++ b/ubuntu/raring/applications/tdeio-locate/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
 Standards-Version: 3.8.4
 
 Package: tdeio-locate-trinity
diff --git a/ubuntu/raring/applications/wlassistant/debian/control.in b/ubuntu/raring/applications/wlassistant/debian/control.in
index df9d5498b..ca673aa4b 100644
--- a/ubuntu/raring/applications/wlassistant/debian/control.in
+++ b/ubuntu/raring/applications/wlassistant/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 4.1.0), cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 4.1.0), quilt, cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4
 
 Package: wlassistant-trinity
diff --git a/ubuntu/raring/dependencies/arts/debian/control.in b/ubuntu/raring/dependencies/arts/debian/control.in
index b9f79f602..893e3ac5b 100644
--- a/ubuntu/raring/dependencies/arts/debian/control.in
+++ b/ubuntu/raring/dependencies/arts/debian/control.in
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), autotools-dev,
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), quilt, autotools-dev,
  docbook-to-man, gawk, gettext, sharutils, texinfo,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev,
diff --git a/ubuntu/raring/dependencies/libart-lgpl/debian/control.in b/ubuntu/raring/dependencies/libart-lgpl/debian/control.in
index aa07e877f..e0b3f3a97 100644
--- a/ubuntu/raring/dependencies/libart-lgpl/debian/control.in
+++ b/ubuntu/raring/dependencies/libart-lgpl/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Josselin Mouette <joss@debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 5), quilt,
                gnome-pkg-tools (>= 0.7),
                cdbs,
                dpkg-dev (>= 1.13.19),
diff --git a/ubuntu/raring/kdegraphics.automake/debian/control.in b/ubuntu/raring/kdegraphics.automake/debian/control.in
index 04be0434c..e5a1beb03 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/control.in
+++ b/ubuntu/raring/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, 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), quilt, 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
diff --git a/ubuntu/raring/libraries/libkipi/debian/control.in b/ubuntu/raring/libraries/libkipi/debian/control.in
index 351f29ef6..b56026751 100644
--- a/ubuntu/raring/libraries/libkipi/debian/control.in
+++ b/ubuntu/raring/libraries/libkipi/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), autotools-dev
 Standards-Version: 3.8.3
 
 Package: libkipi0-trinity-dev
diff --git a/ubuntu/raring/tdeaccessibility/debian/control.in b/ubuntu/raring/tdeaccessibility/debian/control.in
index 70dea8a79..2108f844d 100644
--- a/ubuntu/raring/tdeaccessibility/debian/control.in
+++ b/ubuntu/raring/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, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, gettext, groff-base, tdelibs4-dev, tdemultimedia-dev, libakode-dev, libxtst-dev, sharutils
 Standards-Version: 3.7.2
 
 Package: tdeaccessibility
diff --git a/ubuntu/raring/tdeaddons/debian/control.in b/ubuntu/raring/tdeaddons/debian/control.in
index 9b7f2b6f7..e227d9b99 100644
--- a/ubuntu/raring/tdeaddons/debian/control.in
+++ b/ubuntu/raring/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, 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
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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/raring/tdeadmin/debian/control.in b/ubuntu/raring/tdeadmin/debian/control.in
index 8958b98e4..20ea38faa 100644
--- a/ubuntu/raring/tdeadmin/debian/control.in
+++ b/ubuntu/raring/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, libbz2-dev, libpam0g-dev, lilo [i386 amd64], sharutils, texinfo, rpm
+Build-Depends: cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, 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/raring/tdeartwork/debian/control.in b/ubuntu/raring/tdeartwork/debian/control.in
index 4b914794e..3145180fb 100644
--- a/ubuntu/raring/tdeartwork/debian/control.in
+++ b/ubuntu/raring/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, gawk, gettext, sharutils, tdebase-dev, 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), quilt, 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/raring/tdebase/debian/control.in b/ubuntu/raring/tdebase/debian/control.in
index f135cbfd7..7ce1820cc 100644
--- a/ubuntu/raring/tdebase/debian/control.in
+++ b/ubuntu/raring/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, libdbus-qt-1-dev (>= 0.60), libldap2-dev, 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), quilt, autotools-dev, gawk, gettext, tdelibs4-dev, libdbus-qt-1-dev (>= 0.60), libldap2-dev, 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.8.4
diff --git a/ubuntu/raring/tdeedu/debian/control.in b/ubuntu/raring/tdeedu/debian/control.in
index 1e39e143a..25ff08c24 100644
--- a/ubuntu/raring/tdeedu/debian/control.in
+++ b/ubuntu/raring/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, 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), quilt, 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
diff --git a/ubuntu/raring/tdegames/debian/control.in b/ubuntu/raring/tdegames/debian/control.in
index e4d234b34..89ffd6f4f 100644
--- a/ubuntu/raring/tdegames/debian/control.in
+++ b/ubuntu/raring/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, automake1.9, libtool, groff-base, sharutils, bzip2, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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
 
diff --git a/ubuntu/raring/tdegraphics/debian/control.in b/ubuntu/raring/tdegraphics/debian/control.in
index a34ac5090..88b71b09b 100644
--- a/ubuntu/raring/tdegraphics/debian/control.in
+++ b/ubuntu/raring/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, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, 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), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
 Standards-Version: 3.7.2
 
 Package: tdegraphics
diff --git a/ubuntu/raring/tdelibs/debian/control.in b/ubuntu/raring/tdelibs/debian/control.in
index 43f0657aa..2589b9e94 100644
--- a/ubuntu/raring/tdelibs/debian/control.in
+++ b/ubuntu/raring/tdelibs/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.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
diff --git a/ubuntu/raring/tdemultimedia/debian/control.in b/ubuntu/raring/tdemultimedia/debian/control.in
index f79201647..0fb3e254a 100644
--- a/ubuntu/raring/tdemultimedia/debian/control.in
+++ b/ubuntu/raring/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, 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), quilt, 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
diff --git a/ubuntu/raring/tdenetwork/debian/control.in b/ubuntu/raring/tdenetwork/debian/control.in
index 3c9f904e6..0c14b82f5 100644
--- a/ubuntu/raring/tdenetwork/debian/control.in
+++ b/ubuntu/raring/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, libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !s390 !s390x], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff-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), quilt, 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, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: tdenetwork
diff --git a/ubuntu/raring/tdepim/debian/control.in b/ubuntu/raring/tdepim/debian/control.in
index ab6e20fa4..bab9b686d 100644
--- a/ubuntu/raring/tdepim/debian/control.in
+++ b/ubuntu/raring/tdepim/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), automake1.9,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9,
  cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
diff --git a/ubuntu/raring/tdesdk/debian/control.in b/ubuntu/raring/tdesdk/debian/control.in
index da3e8d50a..8185ba206 100644
--- a/ubuntu/raring/tdesdk/debian/control.in
+++ b/ubuntu/raring/tdesdk/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,
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk,
  gettext, pkg-config, tdelibs4-dev, binutils-dev, bison, flex,
  tdepim-dev, libapr1-dev, libkcal2-dev,
  libktnef1-dev, libsvn-dev
diff --git a/ubuntu/raring/tdetoys/debian/control.in b/ubuntu/raring/tdetoys/debian/control.in
index 5fb46a280..62da248a9 100644
--- a/ubuntu/raring/tdetoys/debian/control.in
+++ b/ubuntu/raring/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, gawk, gettext, sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, tdelibs4-dev, gawk, gettext, sharutils
 Standards-Version: 3.7.2
 
 Package: tdetoys
diff --git a/ubuntu/raring/tdeutils/debian/control.in b/ubuntu/raring/tdeutils/debian/control.in
index c922d5426..27b1a4a27 100644
--- a/ubuntu/raring/tdeutils/debian/control.in
+++ b/ubuntu/raring/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, tdebase-dev, libkonq4-dev, 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), quilt, 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
 
diff --git a/ubuntu/raring/tdewebdev/debian/control.in b/ubuntu/raring/tdewebdev/debian/control.in
index 0712c3cef..70558c570 100644
--- a/ubuntu/raring/tdewebdev/debian/control.in
+++ b/ubuntu/raring/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, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs4-dev, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.7.2
 
 Package: tdewebdev