Switch patch system from simple to quilt on Debian and Ubuntu

376 files changed, 490 insertions, 216 deletions

diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/abakus/debian/control b/ubuntu/maverick/applications/abakus/debian/control
index 7e580c5cb..29900d32a 100644
--- a/ubuntu/maverick/applications/abakus/debian/control
+++ b/ubuntu/maverick/applications/abakus/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-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/patches/.gitignore b/ubuntu/maverick/applications/abakus/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/adept/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/abakus/debian/patches/series
diff --git a/ubuntu/maverick/applications/abakus/debian/rules b/ubuntu/maverick/applications/abakus/debian/rules
index c856f7cae..83d7d7fb4 100755
--- a/ubuntu/maverick/applications/abakus/debian/rules
+++ b/ubuntu/maverick/applications/abakus/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/adept/debian/control b/ubuntu/maverick/applications/adept/debian/control
index 85debf475..a51c16730 100644
--- a/ubuntu/maverick/applications/adept/debian/control
+++ b/ubuntu/maverick/applications/adept/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Peter Rockai <me@mornfall.net>
 Uploaders: Isaac Clerencia <isaac@debian.org>, Enrico Zini <enrico@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), 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, automake, autoconf, 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), 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, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: adept-trinity
diff --git a/ubuntu/maverick/applications/bibletime/debian/patches/.gitignore b/ubuntu/maverick/applications/adept/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/bibletime/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/adept/debian/patches/series
diff --git a/ubuntu/maverick/applications/adept/debian/rules b/ubuntu/maverick/applications/adept/debian/rules
index 742307eb6..0e554102b 100755
--- a/ubuntu/maverick/applications/adept/debian/rules
+++ b/ubuntu/maverick/applications/adept/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/rules b/ubuntu/maverick/applications/amarok.cmake/debian/rules
index 4fd9a743d..7f157aa03 100755
--- a/ubuntu/maverick/applications/amarok.cmake/debian/rules
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/basket/debian/control b/ubuntu/maverick/applications/basket/debian/control
index 41c351fb9..271295621 100644
--- a/ubuntu/maverick/applications/basket/debian/control
+++ b/ubuntu/maverick/applications/basket/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, debhelper (>= 5), tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs, debhelper (>= 5), tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: basket-trinity
diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules
index d3cf5255e..4afb63bdd 100755
--- a/ubuntu/maverick/applications/basket/debian/rules
+++ b/ubuntu/maverick/applications/basket/debian/rules
@@ -26,10 +26,10 @@ else
 	CFLAGS += -O2
 endif
 
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 
-config.status: $(QUILT_STAMPFN)
+config.status: post-patches
 	dh_testdir
 	test -e config.sub -a -L config.sub || \
 		ln -sf /usr/share/misc/config.sub config.sub
@@ -59,7 +59,7 @@ build-stamp:  config.status
 
 	touch build-stamp
 
-clean: unpatch
+clean::
 	dh_testdir
 	dh_testroot
 
diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore b/ubuntu/maverick/applications/bibletime/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/bibletime/debian/patches/series
diff --git a/ubuntu/maverick/applications/bibletime/debian/rules b/ubuntu/maverick/applications/bibletime/debian/rules
index 4106bf0f4..9e134b1f7 100755
--- a/ubuntu/maverick/applications/bibletime/debian/rules
+++ b/ubuntu/maverick/applications/bibletime/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_DH_INSTALL_SOURCEDIR := debian
 
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
index 27beb5ab8..699f8b16a 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-tdeconfig-trinity
 Section: libs
 Priority: extra
 Maintainer: Timothy Pearosn <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 5), compiz-trinity-dev, pkg-config, intltool, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, compiz-trinity-dev, pkg-config, intltool, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: compizconfig-backend-tdeconfig-trinity
diff --git a/ubuntu/maverick/applications/digikam/debian/patches/.gitignore b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/digikam/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/patches/series
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules
index 85efaa2fa..eb681a06a 100755
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules
+++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules
@@ -2,7 +2,7 @@
   
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control
index e851cfee2..4713c9d42 100644
--- a/ubuntu/maverick/applications/digikam/debian/control
+++ b/ubuntu/maverick/applications/digikam/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
  libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
  libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
diff --git a/ubuntu/maverick/applications/dolphin/debian/patches/.gitignore b/ubuntu/maverick/applications/digikam/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/dolphin/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/digikam/debian/patches/series
diff --git a/ubuntu/maverick/applications/digikam/debian/rules b/ubuntu/maverick/applications/digikam/debian/rules
index 76fa321bc..cc9992ad3 100755
--- a/ubuntu/maverick/applications/digikam/debian/rules
+++ b/ubuntu/maverick/applications/digikam/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/dolphin/debian/control b/ubuntu/maverick/applications/dolphin/debian/control
index fcbd2594e..27502f3d7 100644
--- a/ubuntu/maverick/applications/dolphin/debian/control
+++ b/ubuntu/maverick/applications/dolphin/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 
 Package: dolphin-trinity
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/patches/.gitignore b/ubuntu/maverick/applications/dolphin/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/dolphin/debian/patches/series
diff --git a/ubuntu/maverick/applications/dolphin/debian/rules b/ubuntu/maverick/applications/dolphin/debian/rules
index 66ea98891..f978c418e 100755
--- a/ubuntu/maverick/applications/dolphin/debian/rules
+++ b/ubuntu/maverick/applications/dolphin/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/control b/ubuntu/maverick/applications/filelight-l10n/debian/control
index bf308060f..ae0d177a1 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/control
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: tdelibs14-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake, autoconf, libtool, libltdl-dev
+Build-Depends: tdelibs14-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.methylblue.com/filelight/
 
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/.gitignore b/ubuntu/maverick/applications/filelight-l10n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/patches/series
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/rules b/ubuntu/maverick/applications/filelight-l10n/debian/rules
index 84a2f4975..6d6088aad 100755
--- a/ubuntu/maverick/applications/filelight-l10n/debian/rules
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/rules
@@ -4,7 +4,7 @@ DEB_PATCHDIRS := debian/patches/common debian/patches
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/control b/ubuntu/maverick/applications/fusion-icon/debian/control
index 0c45f670d..befa8ed81 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/control
+++ b/ubuntu/maverick/applications/fusion-icon/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 XS-Python-Version: all
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), pkg-config, python-all-dev
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev
 Build-Depends-Indep: python-support (>= 0.6), intltool
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/maverick/applications/gwenview/debian/patches/.gitignore b/ubuntu/maverick/applications/fusion-icon/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/gwenview/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/fusion-icon/debian/patches/series
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/rules b/ubuntu/maverick/applications/fusion-icon/debian/rules
index 2b780a204..3c129a596 100755
--- a/ubuntu/maverick/applications/fusion-icon/debian/rules
+++ b/ubuntu/maverick/applications/fusion-icon/debian/rules
@@ -5,7 +5,7 @@ DEB_PYTHON_SYSTEM=pysupport
 include /usr/share/cdbs/1/rules/debhelper.mk
 # include /usr/share/cdbs/1/class/python-distutils.mk
 include debian/python-distutils-custom.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/control b/ubuntu/maverick/applications/gtk-qt-engine/debian/control
index bd427686e..f2100a4e7 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/control
+++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: debhelper (>= 5.0), cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1)
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, cmake, libgtk2.0-dev (>= 2.10.1)
 Standards-Version: 3.8.4
 
 Package: gtk-qt-engine-trinity
diff --git a/ubuntu/maverick/applications/k9copy/debian/patches/.gitignore b/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/k9copy/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/series
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules b/ubuntu/maverick/applications/gtk-qt-engine/debian/rules
index 8c78b986c..64a42472c 100755
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules
+++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/control b/ubuntu/maverick/applications/gtk3-tqt-engine/debian/control
index a192c467e..4acce9a2e 100644
--- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/control
+++ b/ubuntu/maverick/applications/gtk3-tqt-engine/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: gtk3-tqt-engine-trinity
diff --git a/ubuntu/maverick/applications/kaffeine/debian/patches/.gitignore b/ubuntu/maverick/applications/gtk3-tqt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/gtk3-tqt-engine/debian/patches/series
diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/rules b/ubuntu/maverick/applications/gtk3-tqt-engine/debian/rules
index 9bed17b05..e4abe53af 100755
--- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/rules
+++ b/ubuntu/maverick/applications/gtk3-tqt-engine/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/katapult/debian/patches/.gitignore b/ubuntu/maverick/applications/gwenview-i18n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/katapult/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/gwenview-i18n/debian/patches/series
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/rules b/ubuntu/maverick/applications/gwenview-i18n/debian/rules
index 3070a9c9d..045fcc43f 100755
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/rules
+++ b/ubuntu/maverick/applications/gwenview-i18n/debian/rules
@@ -4,7 +4,7 @@ DEB_PATCHDIRS := debian/patches/common debian/patches
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 -include debian/debiandirs
diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/gwenview/debian/control b/ubuntu/maverick/applications/gwenview/debian/control
index 52bebd33b..f5c7f10d9 100644
--- a/ubuntu/maverick/applications/gwenview/debian/control
+++ b/ubuntu/maverick/applications/gwenview/debian/control
@@ -2,7 +2,7 @@ Source: gwenview-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), tdelibs14-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), quilt, tdelibs14-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://gwenview.sourceforge.net
 
diff --git a/ubuntu/maverick/applications/kbfx/debian/patches/.gitignore b/ubuntu/maverick/applications/gwenview/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kbfx/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/gwenview/debian/patches/series
diff --git a/ubuntu/maverick/applications/gwenview/debian/rules b/ubuntu/maverick/applications/gwenview/debian/rules
index 2fca00e50..943f33d55 100755
--- a/ubuntu/maverick/applications/gwenview/debian/rules
+++ b/ubuntu/maverick/applications/gwenview/debian/rules
@@ -4,7 +4,7 @@ DEB_PATCHDIRS := debian/patches/common debian/patches
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/k3b/debian/control b/ubuntu/maverick/applications/k3b/debian/control
index 9ca5728d9..7278af526 100644
--- a/ubuntu/maverick/applications/k3b/debian/control
+++ b/ubuntu/maverick/applications/k3b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.k3b.org
 
diff --git a/ubuntu/maverick/applications/k3b/debian/patches/series b/ubuntu/maverick/applications/k3b/debian/patches/series
new file mode 100644
index 000000000..bff63cb8c
--- /dev/null
+++ b/ubuntu/maverick/applications/k3b/debian/patches/series
@@ -0,0 +1 @@
+111_advice_kubuntu_restricted_extras.diff
diff --git a/ubuntu/maverick/applications/k3b/debian/rules b/ubuntu/maverick/applications/k3b/debian/rules
index cc895cd83..f3d017250 100755
--- a/ubuntu/maverick/applications/k3b/debian/rules
+++ b/ubuntu/maverick/applications/k3b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5
diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/k9copy/debian/control b/ubuntu/maverick/applications/k9copy/debian/control
index 995d38120..d005d4d13 100644
--- a/ubuntu/maverick/applications/k9copy/debian/control
+++ b/ubuntu/maverick/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: k9copy-trinity
diff --git a/ubuntu/maverick/applications/kbookreader/debian/patches/.gitignore b/ubuntu/maverick/applications/k9copy/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/k9copy/debian/patches/series
diff --git a/ubuntu/maverick/applications/k9copy/debian/rules b/ubuntu/maverick/applications/k9copy/debian/rules
index 9d406d017..365bf8ac6 100755
--- a/ubuntu/maverick/applications/k9copy/debian/rules
+++ b/ubuntu/maverick/applications/k9copy/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kaffeine/debian/control b/ubuntu/maverick/applications/kaffeine/debian/control
index 3141b6908..b558621cd 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/control
+++ b/ubuntu/maverick/applications/kaffeine/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>,
  Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev,
  libxtst-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev,
  libcdio-cdda-dev, libcdio-paranoia-dev,
diff --git a/ubuntu/maverick/applications/kdirstat/debian/patches/.gitignore b/ubuntu/maverick/applications/kaffeine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kaffeine/debian/patches/series
diff --git a/ubuntu/maverick/applications/kaffeine/debian/rules b/ubuntu/maverick/applications/kaffeine/debian/rules
index 5087a0863..3afb59271 100755
--- a/ubuntu/maverick/applications/kaffeine/debian/rules
+++ b/ubuntu/maverick/applications/kaffeine/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kasablanca/debian/control b/ubuntu/maverick/applications/kasablanca/debian/control
index 0e8aed6ad..01515bd06 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/control
+++ b/ubuntu/maverick/applications/kasablanca/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Debian TDE Extras Team <pkg-tde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
+Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
 Standards-Version: 3.8.3
 
 Package: kasablanca-trinity
diff --git a/ubuntu/maverick/applications/kasablanca/debian/patches/series b/ubuntu/maverick/applications/kasablanca/debian/patches/series
new file mode 100644
index 000000000..b8743ddd9
--- /dev/null
+++ b/ubuntu/maverick/applications/kasablanca/debian/patches/series
@@ -0,0 +1,2 @@
+04_am_maintainer_mode.diff
+06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/applications/kasablanca/debian/rules b/ubuntu/maverick/applications/kasablanca/debian/rules
index 76e30e3f1..e12e8b448 100755
--- a/ubuntu/maverick/applications/kasablanca/debian/rules
+++ b/ubuntu/maverick/applications/kasablanca/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/katapult/debian/control b/ubuntu/maverick/applications/katapult/debian/control
index dc2431d3a..ac493a14a 100644
--- a/ubuntu/maverick/applications/katapult/debian/control
+++ b/ubuntu/maverick/applications/katapult/debian/control
@@ -2,7 +2,7 @@ Source: katapult-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), tdelibs14-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: katapult-trinity
diff --git a/ubuntu/maverick/applications/kdpkg/debian/patches/.gitignore b/ubuntu/maverick/applications/katapult/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/katapult/debian/patches/series
diff --git a/ubuntu/maverick/applications/katapult/debian/rules b/ubuntu/maverick/applications/katapult/debian/rules
index 779671876..8f2dd7642 100755
--- a/ubuntu/maverick/applications/katapult/debian/rules
+++ b/ubuntu/maverick/applications/katapult/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kbfx/debian/control b/ubuntu/maverick/applications/kbfx/debian/control
index bd38e2009..810bb6c7a 100644
--- a/ubuntu/maverick/applications/kbfx/debian/control
+++ b/ubuntu/maverick/applications/kbfx/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), cmake, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, cmake, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: kbfx-trinity
diff --git a/ubuntu/maverick/applications/kmplayer/debian/patches/.gitignore b/ubuntu/maverick/applications/kbfx/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kbfx/debian/patches/series
diff --git a/ubuntu/maverick/applications/kbfx/debian/rules b/ubuntu/maverick/applications/kbfx/debian/rules
index 7c57eacb9..ddf86b0bb 100755
--- a/ubuntu/maverick/applications/kbfx/debian/rules
+++ b/ubuntu/maverick/applications/kbfx/debian/rules
@@ -11,7 +11,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 
 include debian/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kbookreader/debian/control b/ubuntu/maverick/applications/kbookreader/debian/control
index 2a6ebed50..368dfae8f 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/control
+++ b/ubuntu/maverick/applications/kbookreader/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://k9copy.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/knemo/debian/patches/.gitignore b/ubuntu/maverick/applications/kbookreader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knemo/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kbookreader/debian/patches/series
diff --git a/ubuntu/maverick/applications/kbookreader/debian/rules b/ubuntu/maverick/applications/kbookreader/debian/rules
index 53794c4fe..ef1dd49ff 100755
--- a/ubuntu/maverick/applications/kbookreader/debian/rules
+++ b/ubuntu/maverick/applications/kbookreader/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/control b/ubuntu/maverick/applications/kcmautostart/debian/control
index 2eb9e9c3f..225c33269 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/control
+++ b/ubuntu/maverick/applications/kcmautostart/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kcontrol-autostart-trinity
diff --git a/ubuntu/maverick/applications/knetstats/debian/patches/.gitignore b/ubuntu/maverick/applications/kcmautostart/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knetstats/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kcmautostart/debian/patches/series
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/rules b/ubuntu/maverick/applications/kcmautostart/debian/rules
index 9bed17b05..e4abe53af 100755
--- a/ubuntu/maverick/applications/kcmautostart/debian/rules
+++ b/ubuntu/maverick/applications/kcmautostart/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
diff --git a/ubuntu/maverick/applications/kcmldap/debian/control b/ubuntu/maverick/applications/kcmldap/debian/control
index 5bdbbbe9c..77afbaf4a 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/control
+++ b/ubuntu/maverick/applications/kcmldap/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kcontrol-ldap-bonding-trinity
diff --git a/ubuntu/maverick/applications/koffice/debian/patches/.gitignore b/ubuntu/maverick/applications/kcmldap/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/koffice/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kcmldap/debian/patches/series
diff --git a/ubuntu/maverick/applications/kcmldap/debian/rules b/ubuntu/maverick/applications/kcmldap/debian/rules
index 9bed17b05..e4abe53af 100755
--- a/ubuntu/maverick/applications/kcmldap/debian/rules
+++ b/ubuntu/maverick/applications/kcmldap/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/control b/ubuntu/maverick/applications/kcmldapcontroller/debian/control
index bd10bfa04..81a9a046d 100644
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/control
+++ b/ubuntu/maverick/applications/kcmldapcontroller/debian/control
@@ -2,7 +2,7 @@ Source: kcontrol-ldap-controller-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kcontrol-ldap-controller-trinity
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/.gitignore b/ubuntu/maverick/applications/kcmldapcontroller/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kcmldapcontroller/debian/patches/series
diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/rules b/ubuntu/maverick/applications/kcmldapcontroller/debian/rules
index 9bed17b05..e4abe53af 100755
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/rules
+++ b/ubuntu/maverick/applications/kcmldapcontroller/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/control b/ubuntu/maverick/applications/kcmldapmanager/debian/control
index 10551309e..70af95ae3 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/control
+++ b/ubuntu/maverick/applications/kcmldapmanager/debian/control
@@ -2,7 +2,7 @@ Source: kcontrol-ldap-manager-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kcontrol-ldap-manager-trinity
diff --git a/ubuntu/maverick/applications/kpowersave/debian/patches/.gitignore b/ubuntu/maverick/applications/kcmldapmanager/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kcmldapmanager/debian/patches/series
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/rules b/ubuntu/maverick/applications/kcmldapmanager/debian/rules
index 9bed17b05..e4abe53af 100755
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/rules
+++ b/ubuntu/maverick/applications/kcmldapmanager/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kdirstat/debian/control b/ubuntu/maverick/applications/kdirstat/debian/control
index 4795318f8..d83d71afe 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/control
+++ b/ubuntu/maverick/applications/kdirstat/debian/control
@@ -2,7 +2,7 @@ Source: kdirstat-trinity
 Section: misc
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), quilt, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://kdirstat.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/krusader/debian/patches/.gitignore b/ubuntu/maverick/applications/kdirstat/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/krusader/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kdirstat/debian/patches/series
diff --git a/ubuntu/maverick/applications/kdirstat/debian/rules b/ubuntu/maverick/applications/kdirstat/debian/rules
index 8c0a950a3..afa7b060d 100755
--- a/ubuntu/maverick/applications/kdirstat/debian/rules
+++ b/ubuntu/maverick/applications/kdirstat/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/kdpkg/debian/control b/ubuntu/maverick/applications/kdpkg/debian/control
index 1b89e2450..5e2bc7870 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/control
+++ b/ubuntu/maverick/applications/kdpkg/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, gettext, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, gettext, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdpkg-trinity
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/patches/.gitignore b/ubuntu/maverick/applications/kdpkg/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kdpkg/debian/patches/series
diff --git a/ubuntu/maverick/applications/kdpkg/debian/rules b/ubuntu/maverick/applications/kdpkg/debian/rules
index 455414f69..2ff6ee66f 100755
--- a/ubuntu/maverick/applications/kdpkg/debian/rules
+++ b/ubuntu/maverick/applications/kdpkg/debian/rules
@@ -2,7 +2,7 @@
   
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/keep/debian/control b/ubuntu/maverick/applications/keep/debian/control
index ee2e6676f..1e411624f 100644
--- a/ubuntu/maverick/applications/keep/debian/control
+++ b/ubuntu/maverick/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: keep-trinity
diff --git a/ubuntu/maverick/applications/keep/debian/patches/series b/ubuntu/maverick/applications/keep/debian/patches/series
new file mode 100644
index 000000000..9ccf4a125
--- /dev/null
+++ b/ubuntu/maverick/applications/keep/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/applications/keep/debian/rules b/ubuntu/maverick/applications/keep/debian/rules
index c08262790..ae055a958 100755
--- a/ubuntu/maverick/applications/keep/debian/rules
+++ b/ubuntu/maverick/applications/keep/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/kerberostray/debian/control b/ubuntu/maverick/applications/kerberostray/debian/control
index 215814458..bf4d6c2e5 100644
--- a/ubuntu/maverick/applications/kerberostray/debian/control
+++ b/ubuntu/maverick/applications/kerberostray/debian/control
@@ -2,7 +2,7 @@ Source: kerberostray-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kerberostray-trinity
diff --git a/ubuntu/maverick/applications/ktorrent/debian/patches/.gitignore b/ubuntu/maverick/applications/kerberostray/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kerberostray/debian/patches/series
diff --git a/ubuntu/maverick/applications/kerberostray/debian/rules b/ubuntu/maverick/applications/kerberostray/debian/rules
index 9bed17b05..e4abe53af 100755
--- a/ubuntu/maverick/applications/kerberostray/debian/rules
+++ b/ubuntu/maverick/applications/kerberostray/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kerry/debian/control b/ubuntu/maverick/applications/kerry/debian/control
index 914717575..04a60414a 100644
--- a/ubuntu/maverick/applications/kerry/debian/control
+++ b/ubuntu/maverick/applications/kerry/debian/control
@@ -2,7 +2,7 @@ Source: kerry-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
index 811069db9..7b06f8128 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
+++ b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
@@ -1,8 +1,9 @@
-diff -Nur kerry-0.2.1/kerry/src/Makefile.am kerry-0.2.1.new/kerry/src/Makefile.am
---- kerry-0.2.1/kerry/src/Makefile.am	2006-12-05 18:28:31.000000000 +0100
-+++ kerry-0.2.1.new/kerry/src/Makefile.am	2006-12-05 18:28:53.000000000 +0100
+Index: b/kerry/src/Makefile.am
+===================================================================
+--- a/kerry/src/Makefile.am
++++ b/kerry/src/Makefile.am
 @@ -31,7 +31,7 @@
- kerry_la_LIBADD = -lkio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_TDEABC) -lDCOP $(LIB_QT) $(LIB_TDECORE)
+ kerry_la_LIBADD = -ltdeio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_TDEABC) -lDCOP $(LIB_QT) $(LIB_TDECORE)
  
  autostartdir = $(datadir)/autostart
 -autostart_DATA = kerry.autostart.desktop beagled.desktop
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/series b/ubuntu/maverick/applications/kerry/debian/patches/series
new file mode 100644
index 000000000..f23925f70
--- /dev/null
+++ b/ubuntu/maverick/applications/kerry/debian/patches/series
@@ -0,0 +1,3 @@
+kubuntu_03_no_beagle_autostart.patch
+kubuntu_04_no_core_kmenu_entry.desktop.patch
+kubuntu_05_shortkey.patch
diff --git a/ubuntu/maverick/applications/kerry/debian/rules b/ubuntu/maverick/applications/kerry/debian/rules
index dea466c17..7b26c5eb5 100755
--- a/ubuntu/maverick/applications/kerry/debian/rules
+++ b/ubuntu/maverick/applications/kerry/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 # include /usr/share/cdbs/1/class/kde.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/control b/ubuntu/maverick/applications/kftpgrabber/debian/control
index eaa793711..3e06c17d3 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/control
+++ b/ubuntu/maverick/applications/kftpgrabber/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Debian TDE Extras Team <pkg-tde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
+Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
 Standards-Version: 3.8.3
 Homepage: http://www.kftp.org
 
diff --git a/ubuntu/maverick/applications/kvirc/debian/patches/.gitignore b/ubuntu/maverick/applications/kftpgrabber/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kvirc/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kftpgrabber/debian/patches/series
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/rules b/ubuntu/maverick/applications/kftpgrabber/debian/rules
index 51e8bf7a9..64be165cd 100755
--- a/ubuntu/maverick/applications/kftpgrabber/debian/rules
+++ b/ubuntu/maverick/applications/kftpgrabber/debian/rules
@@ -2,7 +2,7 @@
  
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/control b/ubuntu/maverick/applications/kgtk-qt3/debian/control
index d00331788..aabff8853 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/control
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/control
@@ -2,7 +2,7 @@ Source: kgtk-qt3-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-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/kvkbd/debian/patches/.gitignore b/ubuntu/maverick/applications/kgtk-qt3/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/patches/series
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/rules b/ubuntu/maverick/applications/kgtk-qt3/debian/rules
index b4cb7a953..91c8ec995 100755
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/rules
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kiosktool/debian/control b/ubuntu/maverick/applications/kiosktool/debian/control
index 322d2b3b4..6779d88ff 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/control
+++ b/ubuntu/maverick/applications/kiosktool/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.1.0), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kiosktool-trinity
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/series b/ubuntu/maverick/applications/kiosktool/debian/patches/series
new file mode 100644
index 000000000..f33e94505
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/series
@@ -0,0 +1,2 @@
+kubuntu_02_kmenu.diff
+kubuntu_03_sudo_support.diff
diff --git a/ubuntu/maverick/applications/kiosktool/debian/rules b/ubuntu/maverick/applications/kiosktool/debian/rules
index 507e5a458..7e010577d 100755
--- a/ubuntu/maverick/applications/kiosktool/debian/rules
+++ b/ubuntu/maverick/applications/kiosktool/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kmplayer/debian/control b/ubuntu/maverick/applications/kmplayer/debian/control
index ac1cac49a..e9c67c756 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/control
+++ b/ubuntu/maverick/applications/kmplayer/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
  libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev,
  libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, docbook2x,
  automake, autoconf, libtool, libltdl-dev
diff --git a/ubuntu/maverick/applications/piklab/debian/patches/.gitignore b/ubuntu/maverick/applications/kmplayer/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/piklab/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kmplayer/debian/patches/series
diff --git a/ubuntu/maverick/applications/kmplayer/debian/rules b/ubuntu/maverick/applications/kmplayer/debian/rules
index 2c29e9b14..093944c34 100755
--- a/ubuntu/maverick/applications/kmplayer/debian/rules
+++ b/ubuntu/maverick/applications/kmplayer/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kmymoney/debian/control b/ubuntu/maverick/applications/kmymoney/debian/control
index a8a2b7284..94c4c54a7 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/control
+++ b/ubuntu/maverick/applications/kmymoney/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, recode, html2ps
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, recode, html2ps
 Standards-Version: 3.8.4
 
 Package: kmymoney2-trinity
diff --git a/ubuntu/maverick/applications/rosegarden/debian/patches/.gitignore b/ubuntu/maverick/applications/kmymoney/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kmymoney/debian/patches/series
diff --git a/ubuntu/maverick/applications/kmymoney/debian/rules b/ubuntu/maverick/applications/kmymoney/debian/rules
index 4c3b55cb4..d636191c4 100755
--- a/ubuntu/maverick/applications/kmymoney/debian/rules
+++ b/ubuntu/maverick/applications/kmymoney/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/knemo/debian/control b/ubuntu/maverick/applications/knemo/debian/control
index 97ac6597a..e98618b20 100644
--- a/ubuntu/maverick/applications/knemo/debian/control
+++ b/ubuntu/maverick/applications/knemo/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>> 4.1), cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 4.1), quilt, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: knemo-trinity
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/patches/.gitignore b/ubuntu/maverick/applications/knemo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/knemo/debian/patches/series
diff --git a/ubuntu/maverick/applications/knemo/debian/rules b/ubuntu/maverick/applications/knemo/debian/rules
index 345d9f54d..9e3a13754 100755
--- a/ubuntu/maverick/applications/knemo/debian/rules
+++ b/ubuntu/maverick/applications/knemo/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/knetstats/debian/control b/ubuntu/maverick/applications/knetstats/debian/control
index f710b9e09..611a29672 100644
--- a/ubuntu/maverick/applications/knetstats/debian/control
+++ b/ubuntu/maverick/applications/knetstats/debian/control
@@ -2,7 +2,7 @@ Source: knetstats-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5.0), cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://knetstats.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/patches/.gitignore b/ubuntu/maverick/applications/knetstats/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/knetstats/debian/patches/series
diff --git a/ubuntu/maverick/applications/knetstats/debian/rules b/ubuntu/maverick/applications/knetstats/debian/rules
index 1a573fb20..7da95d739 100755
--- a/ubuntu/maverick/applications/knetstats/debian/rules
+++ b/ubuntu/maverick/applications/knetstats/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/rules b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/rules
index 5043dd652..7b801da5f 100755
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/rules
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/knmap/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knmap/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/knmap/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knmap/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/knmap/debian/control b/ubuntu/maverick/applications/knmap/debian/control
index ff43fd3f7..6b8893341 100644
--- a/ubuntu/maverick/applications/knmap/debian/control
+++ b/ubuntu/maverick/applications/knmap/debian/control
@@ -2,7 +2,7 @@ Source: knmap-trinity
 Section: tde
 Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 5), autotools-dev, tdelibs14-trinity-dev, automake, libtool, cdbs, docbook2x, docbook-xml
+Build-Depends: debhelper (>> 5), quilt, autotools-dev, tdelibs14-trinity-dev, automake, libtool, cdbs, docbook2x, docbook-xml
 Standards-Version: 3.8.2
 
 Package: knmap-trinity
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/patches/.gitignore b/ubuntu/maverick/applications/knmap/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/knmap/debian/patches/series
diff --git a/ubuntu/maverick/applications/knmap/debian/rules b/ubuntu/maverick/applications/knmap/debian/rules
index 348e53573..7a20baa99 100755
--- a/ubuntu/maverick/applications/knmap/debian/rules
+++ b/ubuntu/maverick/applications/knmap/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
 
diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
index b93e7c154..a803f50d6 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control
index 6d2e73b8c..4b2f86587 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/maverick/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/patches/.gitignore b/ubuntu/maverick/applications/koffice/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/koffice/debian/patches/series
diff --git a/ubuntu/maverick/applications/koffice/debian/rules b/ubuntu/maverick/applications/koffice/debian/rules
index ed91a11c3..495d85db8 100755
--- a/ubuntu/maverick/applications/koffice/debian/rules
+++ b/ubuntu/maverick/applications/koffice/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/control b/ubuntu/maverick/applications/kpowersave.cmake/debian/control
index d9945fe0f..6a1f1b563 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/control
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-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-tqt-1-dev, 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-tqt-1-dev, libtool, libltdl-dev, cmake
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/patches/.gitignore b/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/series
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/rules b/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
index 0d2383bae..6d3ac5584 100755
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kpowersave/debian/control b/ubuntu/maverick/applications/kpowersave/debian/control
index 9850896db..2f98b883a 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/control
+++ b/ubuntu/maverick/applications/kpowersave/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-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-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
+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-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/patches/.gitignore b/ubuntu/maverick/applications/kpowersave/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kpowersave/debian/patches/series
diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/maverick/applications/kpowersave/debian/rules
index 0cf9afbec..fb0e95a07 100755
--- a/ubuntu/maverick/applications/kpowersave/debian/rules
+++ b/ubuntu/maverick/applications/kpowersave/debian/rules
@@ -2,7 +2,7 @@
   
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/krecipes/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/krecipes/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/krecipes/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/krecipes/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/krename/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/krename/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/krename/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/krename/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/krename/debian/control b/ubuntu/maverick/applications/krename/debian/control
index b87c1a2c1..b6cde2138 100644
--- a/ubuntu/maverick/applications/krename/debian/control
+++ b/ubuntu/maverick/applications/krename/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Richard A. Johnson <nixternal@ubuntu.com> 
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: krename-trinity
diff --git a/ubuntu/maverick/applications/tdesudo/debian/patches/.gitignore b/ubuntu/maverick/applications/krename/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/krename/debian/patches/series
diff --git a/ubuntu/maverick/applications/krename/debian/rules b/ubuntu/maverick/applications/krename/debian/rules
index 4983ad699..7df9beee2 100755
--- a/ubuntu/maverick/applications/krename/debian/rules
+++ b/ubuntu/maverick/applications/krename/debian/rules
@@ -4,7 +4,7 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/krusader/debian/control b/ubuntu/maverick/applications/krusader/debian/control
index 6b7001dcc..26173e10c 100644
--- a/ubuntu/maverick/applications/krusader/debian/control
+++ b/ubuntu/maverick/applications/krusader/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://krusader.sourceforge.net
 
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/patches/.gitignore b/ubuntu/maverick/applications/krusader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/krusader/debian/patches/series
diff --git a/ubuntu/maverick/applications/krusader/debian/rules b/ubuntu/maverick/applications/krusader/debian/rules
index 4b297b1ae..d27f15ff5 100755
--- a/ubuntu/maverick/applications/krusader/debian/rules
+++ b/ubuntu/maverick/applications/krusader/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/ksensors/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/ksensors/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/ksensors/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/ksensors/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/ksensors/debian/control b/ubuntu/maverick/applications/ksensors/debian/control
index f0ba5d2d4..e7de2b810 100644
--- a/ubuntu/maverick/applications/ksensors/debian/control
+++ b/ubuntu/maverick/applications/ksensors/debian/control
@@ -2,7 +2,7 @@ Source: ksensors-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 5), cdbs, autotools-dev, automake, autoconf, libtool, libsensors4-dev, tdelibs14-trinity-dev, imagemagick
+Build-Depends: debhelper (>> 5), quilt, cdbs, autotools-dev, automake, autoconf, libtool, libsensors4-dev, tdelibs14-trinity-dev, imagemagick
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.3
 
diff --git a/ubuntu/maverick/applications/wlassistant/debian/patches/.gitignore b/ubuntu/maverick/applications/ksensors/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/ksensors/debian/patches/series
diff --git a/ubuntu/maverick/applications/ksensors/debian/rules b/ubuntu/maverick/applications/ksensors/debian/rules
index 8b97ef030..8030d443a 100755
--- a/ubuntu/maverick/applications/ksensors/debian/rules
+++ b/ubuntu/maverick/applications/ksensors/debian/rules
@@ -2,7 +2,7 @@
  
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/kshowmail/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kshutdown/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/control b/ubuntu/maverick/applications/ksystemlog/debian/control
index 224657403..a5c21429a 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/control
+++ b/ubuntu/maverick/applications/ksystemlog/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ksystemlog-trinity
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore b/ubuntu/maverick/applications/ksystemlog/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/ksystemlog/debian/patches/series
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/rules b/ubuntu/maverick/applications/ksystemlog/debian/rules
index 5b9d63684..f28f54627 100755
--- a/ubuntu/maverick/applications/ksystemlog/debian/rules
+++ b/ubuntu/maverick/applications/ksystemlog/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index b93e7c154..a803f50d6 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/ktorrent/debian/control b/ubuntu/maverick/applications/ktorrent/debian/control
index 032578e75..65c662809 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/control
+++ b/ubuntu/maverick/applications/ktorrent/debian/control
@@ -2,7 +2,7 @@ Source: ktorrent-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktorrent-trinity
diff --git a/ubuntu/maverick/libraries/libkipi/debian/patches/.gitignore b/ubuntu/maverick/applications/ktorrent/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/ktorrent/debian/patches/series
diff --git a/ubuntu/maverick/applications/ktorrent/debian/rules b/ubuntu/maverick/applications/ktorrent/debian/rules
index d0046eb44..862c88e23 100755
--- a/ubuntu/maverick/applications/ktorrent/debian/rules
+++ b/ubuntu/maverick/applications/ktorrent/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/debian-qt-kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kuickshow/debian/control b/ubuntu/maverick/applications/kuickshow/debian/control
index 9ea44fd4b..58655fe8e 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/control
+++ b/ubuntu/maverick/applications/kuickshow/debian/control
@@ -2,7 +2,7 @@ Source: kuickshow-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, tdelibs14-trinity-dev, imlib11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, tdelibs14-trinity-dev, imlib11-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kuickshow-trinity
diff --git a/ubuntu/maverick/tdegraphics/debian/patches/.gitignore b/ubuntu/maverick/applications/kuickshow/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/tdegraphics/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kuickshow/debian/patches/series
diff --git a/ubuntu/maverick/applications/kuickshow/debian/rules b/ubuntu/maverick/applications/kuickshow/debian/rules
index 46fe966da..1f3a7d8fc 100755
--- a/ubuntu/maverick/applications/kuickshow/debian/rules
+++ b/ubuntu/maverick/applications/kuickshow/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/kvirc/debian/control b/ubuntu/maverick/applications/kvirc/debian/control
index 2702dabc7..6189a1ff1 100644
--- a/ubuntu/maverick/applications/kvirc/debian/control
+++ b/ubuntu/maverick/applications/kvirc/debian/control
@@ -1,5 +1,5 @@
 Source: kvirc-trinity
-Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), tdelibs14-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev
 Section: net
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
diff --git a/ubuntu/maverick/tdepim/debian/patches/.gitignore b/ubuntu/maverick/applications/kvirc/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/tdepim/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/kvirc/debian/patches/series
diff --git a/ubuntu/maverick/applications/kvirc/debian/rules b/ubuntu/maverick/applications/kvirc/debian/rules
index 0cb35b452..d0de2524f 100755
--- a/ubuntu/maverick/applications/kvirc/debian/rules
+++ b/ubuntu/maverick/applications/kvirc/debian/rules
@@ -15,7 +15,7 @@ common-configure-impl::
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/kvkbd/debian/control b/ubuntu/maverick/applications/kvkbd/debian/control
index f391264fc..3449f65e9 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/control
+++ b/ubuntu/maverick/applications/kvkbd/debian/control
@@ -2,7 +2,7 @@ Source: kvkbd-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, libxtst-dev, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, libxtst-dev, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://pan4os.info/main/index.php
 
diff --git a/ubuntu/maverick/applications/kvkbd/debian/patches/series b/ubuntu/maverick/applications/kvkbd/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kvkbd/debian/patches/series
diff --git a/ubuntu/maverick/applications/kvkbd/debian/rules b/ubuntu/maverick/applications/kvkbd/debian/rules
index 0f564108e..1ac5329b7 100755
--- a/ubuntu/maverick/applications/kvkbd/debian/rules
+++ b/ubuntu/maverick/applications/kvkbd/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/piklab/debian/control b/ubuntu/maverick/applications/piklab/debian/control
index e36481273..7864a446b 100644
--- a/ubuntu/maverick/applications/piklab/debian/control
+++ b/ubuntu/maverick/applications/piklab/debian/control
@@ -2,7 +2,7 @@ Source: piklab-trinity
 Section: electronics
 Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath,
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, quilt, chrpath,
  libusb-dev, tdelibs14-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://piklab.sourceforge.net/
diff --git a/ubuntu/maverick/applications/piklab/debian/patches/series b/ubuntu/maverick/applications/piklab/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/piklab/debian/patches/series
diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules
index 6d0a1d510..d15b8b977 100755
--- a/ubuntu/maverick/applications/piklab/debian/rules
+++ b/ubuntu/maverick/applications/piklab/debian/rules
@@ -26,7 +26,9 @@ else
 	CFLAGS += -O2
 endif
 
-config: config-stamp
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+config: post-patches config-stamp
 config-stamp:  configure
 	dh_testdir
 
@@ -39,8 +41,6 @@ config-stamp:  configure
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -62,7 +62,7 @@ build-stamp:  config-stamp
 	#docbook-to-man debian/piklab.sgml > piklab.1
 	touch $@
 
-clean:
+clean::
 	dh_testdir
 	dh_testroot
 
@@ -80,7 +80,6 @@ clean:
 	rm -f po/*.gmo
 	rm -f src/common/global/svn_revision/svn_revision.h
 	rm -f config.sub config.guess config.status config.log
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build-stamp
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/control b/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/control
index 9c2a37a0e..29d985d0a 100644
--- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/control
+++ b/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/control
@@ -2,7 +2,7 @@ Source: qt4-tqt-theme-engine
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libqt4-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libqt4-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: qt4-tqt-theme-engine
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/patches/series b/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/patches/series
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/rules b/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/rules
index 2cde95722..19ea67382 100755
--- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/rules
+++ b/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/qmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/rosegarden/debian/control b/ubuntu/maverick/applications/rosegarden/debian/control
index 8c132318d..d0a03f679 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/control
+++ b/ubuntu/maverick/applications/rosegarden/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
 Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org>
-Build-Depends: debhelper (>> 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, 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, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/ubuntu/maverick/applications/rosegarden/debian/patches/series b/ubuntu/maverick/applications/rosegarden/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/rosegarden/debian/patches/series
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rules b/ubuntu/maverick/applications/rosegarden/debian/rules
index 3fc2b777e..1bac8145d 100755
--- a/ubuntu/maverick/applications/rosegarden/debian/rules
+++ b/ubuntu/maverick/applications/rosegarden/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control
index d69374f01..4c468fc07 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/maverick/applications/tde-guidance/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), chrpath, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev,
  libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
  pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
  python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/patches/series b/ubuntu/maverick/applications/tde-guidance/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-guidance/debian/patches/series
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules
index 0cf0d64e7..ad10455d4 100755
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/maverick/applications/tde-guidance/debian/rules
@@ -5,7 +5,7 @@ DEB_PYTHON_SYSTEM = pysupport
 include /usr/share/cdbs/1/rules/debhelper.mk
 #include /usr/share/cdbs/1/class/python-distutils.mk
 include debian/python-distutils-jaunty.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control
index 10903e11d..60a4dd55f 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org>
-Build-Depends: debhelper (>= 5), tdelibs14-trinity-dev, cmake, cdbs
+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/tde-style-qtcurve/debian/patches/series b/ubuntu/maverick/applications/tde-style-qtcurve/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/patches/series
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules
index 685703a85..f697a7e99 100755
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules
@@ -13,7 +13,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/control b/ubuntu/maverick/applications/tde-systemsettings/debian/control
index fcda9cbaf..eb4b2305c 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/control
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/control
@@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), patchutils (>= 0.2.25), tdelibs14-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), quilt, patchutils (>= 0.2.25), tdelibs14-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tde-systemsettings-trinity
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/patches/series b/ubuntu/maverick/applications/tde-systemsettings/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/patches/series
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/rules b/ubuntu/maverick/applications/tde-systemsettings/debian/rules
index ed2e13a90..7e11dd034 100755
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/rules
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/rules
@@ -3,7 +3,7 @@
 cdbs_kde_enable_debug = --disable-debug
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/control b/ubuntu/maverick/applications/tdeio-apt/debian/control
index 2aa6dbe3a..2a690b5fb 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/control
+++ b/ubuntu/maverick/applications/tdeio-apt/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeio-apt-trinity
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/patches/series b/ubuntu/maverick/applications/tdeio-apt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/tdeio-apt/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/rules b/ubuntu/maverick/applications/tdeio-apt/debian/rules
index 9e8c0f52b..5b3afa420 100755
--- a/ubuntu/maverick/applications/tdeio-apt/debian/rules
+++ b/ubuntu/maverick/applications/tdeio-apt/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/control b/ubuntu/maverick/applications/tdeio-locate/debian/control
index 986621d5f..29f2d4f5c 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/control
+++ b/ubuntu/maverick/applications/tdeio-locate/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com>
-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/tdeio-locate/debian/patches/series b/ubuntu/maverick/applications/tdeio-locate/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/tdeio-locate/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/rules b/ubuntu/maverick/applications/tdeio-locate/debian/rules
index 55427aa5d..01ccf387a 100755
--- a/ubuntu/maverick/applications/tdeio-locate/debian/rules
+++ b/ubuntu/maverick/applications/tdeio-locate/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control
index 07bd1607d..95e8c6b10 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control
@@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 5), cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeio-umountwrapper-trinity
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/patches/series b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/rules b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/rules
index ddfd17b35..27e351eba 100755
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/rules
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/rules b/ubuntu/maverick/applications/tdenetworkmanager/debian/rules
index 00ac9877f..c08c59d57 100755
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/rules
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/control b/ubuntu/maverick/applications/tdepowersave/debian/control
index de60dd3ae..ca4a5def2 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/control
+++ b/ubuntu/maverick/applications/tdepowersave/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/patches/series b/ubuntu/maverick/applications/tdepowersave/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/tdepowersave/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/rules b/ubuntu/maverick/applications/tdepowersave/debian/rules
index 485481ef7..f74a76605 100755
--- a/ubuntu/maverick/applications/tdepowersave/debian/rules
+++ b/ubuntu/maverick/applications/tdepowersave/debian/rules
@@ -2,7 +2,7 @@
   
 include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tdesudo/debian/control b/ubuntu/maverick/applications/tdesudo/debian/control
index 69aff1bb3..0f976fe13 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/control
+++ b/ubuntu/maverick/applications/tdesudo/debian/control
@@ -2,7 +2,7 @@ Source: tdesudo-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 5), cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdesudo-trinity
diff --git a/ubuntu/maverick/applications/tdesudo/debian/patches/series b/ubuntu/maverick/applications/tdesudo/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/tdesudo/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdesudo/debian/rules b/ubuntu/maverick/applications/tdesudo/debian/rules
index 443a43aed..83c31e0c9 100755
--- a/ubuntu/maverick/applications/tdesudo/debian/rules
+++ b/ubuntu/maverick/applications/tdesudo/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tdesvn/debian/rules b/ubuntu/maverick/applications/tdesvn/debian/rules
index 37d2a944b..0e1c5995b 100755
--- a/ubuntu/maverick/applications/tdesvn/debian/rules
+++ b/ubuntu/maverick/applications/tdesvn/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/tork/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tork/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/maverick/applications/tork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tork/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 #include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/control b/ubuntu/maverick/applications/twin-style-crystal/debian/control
index e5de77106..99fa3217d 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/control
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
-Build-Depends: debhelper (>= 5.0.0), cdbs, tdebase-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdebase-trinity-dev, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: twin-style-crystal-trinity
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/patches/series b/ubuntu/maverick/applications/twin-style-crystal/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/patches/series
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/rules b/ubuntu/maverick/applications/twin-style-crystal/debian/rules
index 4fb0c5bb5..00b9013fa 100755
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/rules
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/applications/wlassistant/debian/control b/ubuntu/maverick/applications/wlassistant/debian/control
index a60cee081..c4d96baa8 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/control
+++ b/ubuntu/maverick/applications/wlassistant/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-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/applications/wlassistant/debian/patches/series b/ubuntu/maverick/applications/wlassistant/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/wlassistant/debian/patches/series
diff --git a/ubuntu/maverick/applications/wlassistant/debian/rules b/ubuntu/maverick/applications/wlassistant/debian/rules
index 1a8fdeafb..5e6564e64 100755
--- a/ubuntu/maverick/applications/wlassistant/debian/rules
+++ b/ubuntu/maverick/applications/wlassistant/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/dependencies/arts/debian/control b/ubuntu/maverick/dependencies/arts/debian/control
index c535e2af4..dcffcfc0f 100644
--- a/ubuntu/maverick/dependencies/arts/debian/control
+++ b/ubuntu/maverick/dependencies/arts/debian/control
@@ -4,7 +4,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org>
 Priority: optional
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6),
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), quilt,
  docbook-to-man, gawk, gettext, sharutils, texinfo,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libmad0-dev,
diff --git a/ubuntu/maverick/dependencies/arts/debian/patches/series b/ubuntu/maverick/dependencies/arts/debian/patches/series
new file mode 100644
index 000000000..59e055db8
--- /dev/null
+++ b/ubuntu/maverick/dependencies/arts/debian/patches/series
@@ -0,0 +1 @@
+12_cleanup_artsc-config.diff
diff --git a/ubuntu/maverick/dependencies/arts/debian/rules b/ubuntu/maverick/dependencies/arts/debian/rules
index 1b4911297..8886acad3 100755
--- a/ubuntu/maverick/dependencies/arts/debian/rules
+++ b/ubuntu/maverick/dependencies/arts/debian/rules
@@ -10,7 +10,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/control b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/control
index 36e73bbb1..6c1b0c969 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/control
+++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/control
@@ -2,7 +2,7 @@ Source: dbus-1-tqt
 Section: devel
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
 Standards-Version: 3.8.3
 
 Package: libdbus-1-tqt-dev
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules
index 3b86de7db..0585b8d86 100755
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/control b/ubuntu/maverick/dependencies/dbus-tqt/debian/control
index cdf2d334a..7c5dbc0c4 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/control
+++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake
 Standards-Version: 3.8.3
 
 Package: libdbus-tqt-1-dev
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series b/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules
index a59bed76e..26bf6c196 100755
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules
@@ -3,7 +3,7 @@
 # Copyright � 2003 Daniel Stone <daniels@debian.org>
 # Copyright � 2006 Sjoerd Simons <sjoerd@debian.org>
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control b/ubuntu/maverick/dependencies/libart-lgpl/debian/control
index f637d46a8..4a6f1594e 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/control
+++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/control
@@ -9,7 +9,7 @@ Priority: optional
 Maintainer: Josselin Mouette <joss@debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>, Sebastien Bacher <seb128@debian.org>
 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/dependencies/libart-lgpl/debian/patches/series b/ubuntu/maverick/dependencies/libart-lgpl/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules
index 2751eb1f2..add68d0c4 100755
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules
+++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/control b/ubuntu/maverick/dependencies/libcaldav/debian/control
index 6051e6de1..8ba2fed15 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/control
+++ b/ubuntu/maverick/dependencies/libcaldav/debian/control
@@ -1,5 +1,5 @@
 Source: libcaldav
-Build-Depends: debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
 Section: graphics
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/patches/series b/ubuntu/maverick/dependencies/libcaldav/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/libcaldav/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/rules b/ubuntu/maverick/dependencies/libcaldav/debian/rules
index fb72a35e7..0d067bc3d 100755
--- a/ubuntu/maverick/dependencies/libcaldav/debian/rules
+++ b/ubuntu/maverick/dependencies/libcaldav/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
@@ -28,7 +28,7 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
 
 make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
 
-build: $(QUILT_STAMPFN) build-stamp
+build: post-patches build-stamp
 build-stamp:
 	dh_testdir
 	./autogen.sh
@@ -38,7 +38,7 @@ build-stamp:
 
 	touch build-stamp
 
-clean: unpatch
+clean::
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/control b/ubuntu/maverick/dependencies/libcarddav/debian/control
index 7bf8ff1dc..7e3b740bb 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/control
+++ b/ubuntu/maverick/dependencies/libcarddav/debian/control
@@ -1,5 +1,5 @@
 Source: libcarddav
-Build-Depends: debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev
 Section: graphics
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/patches/series b/ubuntu/maverick/dependencies/libcarddav/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/libcarddav/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/rules b/ubuntu/maverick/dependencies/libcarddav/debian/rules
index 24bdcbc93..b22fbca64 100755
--- a/ubuntu/maverick/dependencies/libcarddav/debian/rules
+++ b/ubuntu/maverick/dependencies/libcarddav/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
@@ -28,7 +28,7 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
 
 make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
 
-build: $(QUILT_STAMPFN) build-stamp
+build: post-patches build-stamp
 build-stamp:
 	dh_testdir
 	./autogen.sh
@@ -38,7 +38,7 @@ build-stamp:
 
 	touch build-stamp
 
-clean: unpatch
+clean::
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/patches/series b/ubuntu/maverick/dependencies/python-tqt/debian/patches/series
index 15bc57c10..573069d8d 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/patches/series
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/patches/series
@@ -1 +1 @@
-debian_configure_changes.diff
+# debian_configure_changes.diff
diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control
index 7641cffbf..37bf73e65 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/control
+++ b/ubuntu/maverick/dependencies/qt3/debian/control
@@ -2,7 +2,7 @@ Source: qt-x11-free
 Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
  libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules
index 7ede42ad9..57dce235a 100755
--- a/ubuntu/maverick/dependencies/qt3/debian/rules
+++ b/ubuntu/maverick/dependencies/qt3/debian/rules
@@ -29,7 +29,7 @@ endif #sparc
 endif #hurd
 
 # quilt stuff
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # build variables (directorys)
 DEBIAN = $(shell pwd)/debian
@@ -123,7 +123,7 @@ build: libqt-thread-stamp
 
 	touch build-stamp
 
-libqt-thread-stamp: $(QUILT_STAMPFN)
+libqt-thread-stamp: post-patches
 
 	@echo "QTDIR is ${QTDIR}"
 
@@ -171,7 +171,7 @@ libqt-thread-stamp: $(QUILT_STAMPFN)
 
 	touch libqt-thread-stamp
 
-clean: unpatch
+clean::
 
 	dh_testdir
 
@@ -475,4 +475,4 @@ binary-arch: build install
 	dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS)
 
 binary: binary-indep binary-arch
-.PHONY: build binary-indep binary-arch binary install clean patch unpatch
+.PHONY: build binary-indep binary-arch binary install clean
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series
index c42871d34..0b31a69ff 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series
+++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series
@@ -1,2 +1,2 @@
-siputils_debian_changes.diff
-siputils_objdir_module_fix.diff
+# siputils_debian_changes.diff
+# siputils_objdir_module_fix.diff
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff
index a9d580737..3c4570b21 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff
+++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff
@@ -1,8 +1,8 @@
-Index: sip4-qt3-4.10/siputils.py
+Index: b/siputils.py
 ===================================================================
---- sip4-qt3-4.10.orig/siputils.py	2010-01-26 23:45:34.144734105 +0100
-+++ sip4-qt3-4.10/siputils.py	2010-01-26 23:46:51.605699383 +0100
-@@ -1546,9 +1546,12 @@
+--- a/siputils.py
++++ b/siputils.py
+@@ -1547,9 +1547,12 @@
          mfile.write("\n$(OFILES): $(HFILES)\n")
  
          for mf in self._build["tqmoc_headers"].split():
@@ -14,5 +14,5 @@ Index: sip4-qt3-4.10/siputils.py
 +                mf = os.path.join(self._src_dir, mf)
 +
              mfile.write("\n%s: %s\n" % (cpp, mf))
-             mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf))
+             mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
  
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/control b/ubuntu/maverick/dependencies/tqt3/debian/control
index 1655a1357..b524aa513 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/control
+++ b/ubuntu/maverick/dependencies/tqt3/debian/control
@@ -2,7 +2,7 @@ Source: tqt-x11-free
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
  libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules
index d2d66f6a7..b91e34413 100755
--- a/ubuntu/maverick/dependencies/tqt3/debian/rules
+++ b/ubuntu/maverick/dependencies/tqt3/debian/rules
@@ -33,7 +33,7 @@ endif #sparc
 endif #hurd
 
 # quilt stuff
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # build variables (directorys)
 DEBIAN = $(shell pwd)/debian
@@ -127,7 +127,7 @@ build: libqt-thread-stamp
 
 	touch build-stamp
 
-libqt-thread-stamp: $(QUILT_STAMPFN)
+libqt-thread-stamp: post-patches
 
 	@echo "QTDIR is ${QTDIR}"
 
@@ -175,7 +175,7 @@ libqt-thread-stamp: $(QUILT_STAMPFN)
 
 	touch libqt-thread-stamp
 
-clean: unpatch
+clean::
 
 	dh_testdir
 
@@ -468,4 +468,4 @@ binary-arch: build install
 	dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS)
 
 binary: binary-indep binary-arch
-.PHONY: build binary-indep binary-arch binary install clean patch unpatch
+.PHONY: build binary-indep binary-arch binary install clean
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/control b/ubuntu/maverick/dependencies/tqtinterface/debian/control
index 4996e799f..c671091c9 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/control
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/control
@@ -2,7 +2,7 @@ Source: libtqtinterface
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 4.0.0), libtqt3-mt-dev, tqt3-apps-dev, cmake, cdbs
+Build-Depends: debhelper (>> 4.0.0), quilt, libtqt3-mt-dev, tqt3-apps-dev, cmake, cdbs
 Standards-Version: 3.8.4
 
 Package: libtqtinterface
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series b/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/rules b/ubuntu/maverick/dependencies/tqtinterface/debian/rules
index 5d8f4cb4c..051e7e40f 100755
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/rules
@@ -3,7 +3,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_KDE_APIDOX := yes
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index df08f2d37..7c7e6d56c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/control b/ubuntu/maverick/kdegraphics.automake/debian/control
index 0c8f94d44..ef09b498c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/control
+++ b/ubuntu/maverick/kdegraphics.automake/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], automake, autoconf, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, kdelibs4-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdegraphics-trinity
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/patches/series b/ubuntu/maverick/kdegraphics.automake/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/kdegraphics.automake/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/rules b/ubuntu/maverick/kdegraphics.automake/debian/rules
index 7a23d61e5..079b05ab7 100755
--- a/ubuntu/maverick/kdegraphics.automake/debian/rules
+++ b/ubuntu/maverick/kdegraphics.automake/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/control b/ubuntu/maverick/kdevelop.cmake/debian/control
index dfa4f6f25..527382167 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/control
+++ b/ubuntu/maverick/kdevelop.cmake/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), qt3-apps-dev, kdelibs4-trinity-dev, gettext, kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, cmake, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), quilt, qt3-apps-dev, kdelibs4-trinity-dev, gettext, kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdevelop-trinity
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/patches/series b/ubuntu/maverick/kdevelop.cmake/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/kdevelop.cmake/debian/patches/series
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/rules b/ubuntu/maverick/kdevelop.cmake/debian/rules
index 0bf8bfe14..ed08238eb 100755
--- a/ubuntu/maverick/kdevelop.cmake/debian/rules
+++ b/ubuntu/maverick/kdevelop.cmake/debian/rules
@@ -6,7 +6,7 @@ makebuilddir::
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/libraries/libkipi/debian/control b/ubuntu/maverick/libraries/libkipi/debian/control
index ef0ce9d5c..7f4a700ce 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/control
+++ b/ubuntu/maverick/libraries/libkipi/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: libkipi0-trinity-dev
diff --git a/ubuntu/maverick/libraries/libkipi/debian/patches/series b/ubuntu/maverick/libraries/libkipi/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/libraries/libkipi/debian/patches/series
diff --git a/ubuntu/maverick/libraries/libkipi/debian/rules b/ubuntu/maverick/libraries/libkipi/debian/rules
index c95fe1343..9835b9048 100755
--- a/ubuntu/maverick/libraries/libkipi/debian/rules
+++ b/ubuntu/maverick/libraries/libkipi/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/control b/ubuntu/maverick/libraries/libtdeldap/debian/control
index 78bbffbc8..0f20c21ab 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/control
+++ b/ubuntu/maverick/libraries/libtdeldap/debian/control
@@ -2,7 +2,7 @@ Source: libtdeldap-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libldap2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libldap2-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: libtdeldap-trinity
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/patches/series b/ubuntu/maverick/libraries/libtdeldap/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/libraries/libtdeldap/debian/patches/series
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/rules b/ubuntu/maverick/libraries/libtdeldap/debian/rules
index 9bed17b05..e4abe53af 100755
--- a/ubuntu/maverick/libraries/libtdeldap/debian/rules
+++ b/ubuntu/maverick/libraries/libtdeldap/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
diff --git a/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdeaccessibility/debian/control b/ubuntu/maverick/tdeaccessibility/debian/control
index f846cdabd..b043b9a3a 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/control
+++ b/ubuntu/maverick/tdeaccessibility/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, groff-base, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, gettext, groff-base, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeaccessibility-trinity
diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/series b/ubuntu/maverick/tdeaccessibility/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdeaccessibility/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdeaccessibility/debian/rules b/ubuntu/maverick/tdeaccessibility/debian/rules
index 4fdbdb6c3..98b74d04f 100755
--- a/ubuntu/maverick/tdeaccessibility/debian/rules
+++ b/ubuntu/maverick/tdeaccessibility/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdeaddons/debian/control b/ubuntu/maverick/tdeaddons/debian/control
index 381d26c37..1efa78da4 100644
--- a/ubuntu/maverick/tdeaddons/debian/control
+++ b/ubuntu/maverick/tdeaddons/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeaddons-trinity
diff --git a/ubuntu/maverick/tdeaddons/debian/patches/series b/ubuntu/maverick/tdeaddons/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdeaddons/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdeaddons/debian/rules b/ubuntu/maverick/tdeaddons/debian/rules
index 8e8bb53a9..692eacfb0 100755
--- a/ubuntu/maverick/tdeaddons/debian/rules
+++ b/ubuntu/maverick/tdeaddons/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/maverick/tdeadmin/debian/control
index 9a38f650a..990a72cbe 100644
--- a/ubuntu/maverick/tdeadmin/debian/control
+++ b/ubuntu/maverick/tdeadmin/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), docbook-to-man, gawk, gettext, tdelibs14-trinity-dev, libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 5.0.31), quilt, docbook-to-man, gawk, gettext, tdelibs14-trinity-dev, libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeadmin-trinity
diff --git a/ubuntu/maverick/tdeadmin/debian/patches/series b/ubuntu/maverick/tdeadmin/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdeadmin/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdeadmin/debian/rules b/ubuntu/maverick/tdeadmin/debian/rules
index 849de5f21..4ddc3ff78 100755
--- a/ubuntu/maverick/tdeadmin/debian/rules
+++ b/ubuntu/maverick/tdeadmin/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/tdeartwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeartwork/debian/cdbs/debian-qt-kde.mk
index 497be9751..425264528 100644
--- a/ubuntu/maverick/tdeartwork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeartwork/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control
index 71e85c054..ce11a9c95 100644
--- a/ubuntu/maverick/tdeartwork/debian/control
+++ b/ubuntu/maverick/tdeartwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, tdelibs14-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, tdelibs14-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/maverick/tdeartwork/debian/patches/series b/ubuntu/maverick/tdeartwork/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/tdeartwork/debian/patches/series
diff --git a/ubuntu/maverick/tdeartwork/debian/rules b/ubuntu/maverick/tdeartwork/debian/rules
index 963f996bc..062bd4f29 100755
--- a/ubuntu/maverick/tdeartwork/debian/rules
+++ b/ubuntu/maverick/tdeartwork/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
diff --git a/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 748ea8bf5..e998c677b 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
index cd5b0b2eb..9dfccdbd7 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
@@ -1,7 +1,9 @@
---- tdebase/konsole/konsolesu.desktop
-+++ tdebase/konsole/konsolesu.desktop
-@@ -81,3 +81,4 @@
- Name[zh_TW]=終端機程式 - 超級使用者模式
+Index: b/konsole/konsolesu.desktop
+===================================================================
+--- a/konsole/konsolesu.desktop
++++ b/konsole/konsolesu.desktop
+@@ -82,3 +82,4 @@
+ GenericName[zh_TW]=終端機程式 - 超級使用者模式
  X-TDE-AuthorizeAction=shell_access
  Categories=Qt;TDE;X-TDE-System-su;
 +NoDisplay=true
diff --git a/ubuntu/maverick/tdebase/debian/patches/series b/ubuntu/maverick/tdebase/debian/patches/series
new file mode 100644
index 000000000..382f72a04
--- /dev/null
+++ b/ubuntu/maverick/tdebase/debian/patches/series
@@ -0,0 +1,21 @@
+disable_default_tdm_theme.diff
+disable_starttde_wallpaper.diff
+kubuntu_04_hide_menu_entries.diff
+kubuntu_06_hide_home_menu_entry.diff
+kubuntu_07_hide_knetattach_menu_entry.diff
+kubuntu_08_hide_kcmkicker_menu_entry.diff
+kubuntu_09_hide_kpersonaliser_menu_entry.diff
+kubuntu_10_hide_kmenuedit_menu_entry.diff
+kubuntu_11_hide_kappfinder_menu_entry.diff
+kubuntu_13_hide_konsolesu_menu_entry.diff
+kubuntu_14_hide_konquerorsu_menu_entry.diff
+kubuntu_15_hide_tdefontview_menu_entry.diff
+kubuntu_16_hide_kpager_menu_entry.diff
+kubuntu_35_hide_klipper_menu_entry.diff
+kubuntu_37_hide_tdeprintfax_menu_entry.diff
+kubuntu_48_hide_display.diff
+kubuntu_70_hide_printers_desktop.diff
+kubuntu_78_kcontrol_hide_component_chooser.diff
+kubuntu_89_new_logout_ui.diff
+kubuntu_9904_hide_kfind.diff
+kubuntu_9921_tdm_bulletproof_x.diff
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 4982940b1..af7515161 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk
index 2a219d60a..1e862f623 100644
--- a/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdeedu/debian/control b/ubuntu/maverick/tdeedu/debian/control
index de39b7e8a..2f248f286 100644
--- a/ubuntu/maverick/tdeedu/debian/control
+++ b/ubuntu/maverick/tdeedu/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, libogg-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdeedu-trinity
diff --git a/ubuntu/maverick/tdeedu/debian/patches/series b/ubuntu/maverick/tdeedu/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdeedu/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdeedu/debian/rules b/ubuntu/maverick/tdeedu/debian/rules
index 9f81df4c0..c457b98e2 100755
--- a/ubuntu/maverick/tdeedu/debian/rules
+++ b/ubuntu/maverick/tdeedu/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdegames/debian/control b/ubuntu/maverick/tdegames/debian/control
index 80c1c1a03..419fbc5fd 100644
--- a/ubuntu/maverick/tdegames/debian/control
+++ b/ubuntu/maverick/tdegames/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtool, groff-base, sharutils, bzip2, sharutils, libogg-dev, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/maverick/tdegames/debian/patches/series b/ubuntu/maverick/tdegames/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdegames/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdegames/debian/rules b/ubuntu/maverick/tdegames/debian/rules
index 085eb8404..7f682874f 100755
--- a/ubuntu/maverick/tdegames/debian/rules
+++ b/ubuntu/maverick/tdegames/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 export kde_bindir = /opt/trinity/games
diff --git a/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk
index df08f2d37..7c7e6d56c 100644
--- a/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdegraphics/debian/control b/ubuntu/maverick/tdegraphics/debian/control
index 623d2dceb..1e30c8884 100644
--- a/ubuntu/maverick/tdegraphics/debian/control
+++ b/ubuntu/maverick/tdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdegraphics-trinity
diff --git a/ubuntu/maverick/tdegraphics/debian/patches/series b/ubuntu/maverick/tdegraphics/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdegraphics/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdegraphics/debian/rules b/ubuntu/maverick/tdegraphics/debian/rules
index 9aedb5fcf..87727752f 100755
--- a/ubuntu/maverick/tdegraphics/debian/rules
+++ b/ubuntu/maverick/tdegraphics/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index 279e62d52..ef3874593 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
+Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-dev,
  binutils (>= 2.14.90.0.7), binutils-dev, docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 14.0.0), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
diff --git a/ubuntu/maverick/tdelibs/debian/patches/series b/ubuntu/maverick/tdelibs/debian/patches/series
new file mode 100644
index 000000000..b5490e13d
--- /dev/null
+++ b/ubuntu/maverick/tdelibs/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_19_debianize_useragent.diff
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index fe0cc4433..d64786b7d 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/maverick/tdemultimedia/debian/control
index 56fb029fe..abfb6c797 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control
+++ b/ubuntu/maverick/tdemultimedia/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, sharutils, texinfo, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdemultimedia-trinity
diff --git a/ubuntu/maverick/tdemultimedia/debian/patches/series b/ubuntu/maverick/tdemultimedia/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdemultimedia/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdemultimedia/debian/rules b/ubuntu/maverick/tdemultimedia/debian/rules
index 4dcb0d43d..1a946ecfc 100755
--- a/ubuntu/maverick/tdemultimedia/debian/rules
+++ b/ubuntu/maverick/tdemultimedia/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
diff --git a/ubuntu/maverick/tdenetwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdenetwork/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/ubuntu/maverick/tdenetwork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdenetwork/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control
index 5228e65e0..686a4eeb7 100644
--- a/ubuntu/maverick/tdenetwork/debian/control
+++ b/ubuntu/maverick/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
diff --git a/ubuntu/maverick/tdenetwork/debian/patches/series b/ubuntu/maverick/tdenetwork/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdenetwork/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules
index 0ee562691..539d5a557 100755
--- a/ubuntu/maverick/tdenetwork/debian/rules
+++ b/ubuntu/maverick/tdenetwork/debian/rules
@@ -15,7 +15,7 @@ export DH_OPTIONS
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
diff --git a/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk
index fa0d532f4..ec89756bb 100644
--- a/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 6a06bda38..3bdcc7478 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31),
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt,
  cdparanoia, gawk, gettext, tdelibs14-trinity-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev, libogg-dev,
  libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
diff --git a/ubuntu/maverick/tdepim/debian/patches/series b/ubuntu/maverick/tdepim/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/tdepim/debian/patches/series
diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules
index 48c8b7fa2..e01240a19 100755
--- a/ubuntu/maverick/tdepim/debian/rules
+++ b/ubuntu/maverick/tdepim/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.mk
 
diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index 7cb17058f..552888667 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/tdesdk/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk,
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, gawk,
  gettext, pkg-config, tdelibs14-trinity-dev, binutils-dev, bison, flex,
  tdepim-trinity-dev, libapr1-dev, libkcal2-trinity-dev,
  libktnef1-trinity-dev, libsvn-dev, libdb-dev,
diff --git a/ubuntu/maverick/tdesdk/debian/patches/series b/ubuntu/maverick/tdesdk/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdesdk/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules
index 15a2da318..c4ecc592b 100755
--- a/ubuntu/maverick/tdesdk/debian/rules
+++ b/ubuntu/maverick/tdesdk/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
diff --git a/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdetoys/debian/control b/ubuntu/maverick/tdetoys/debian/control
index 673937581..11ba906c3 100644
--- a/ubuntu/maverick/tdetoys/debian/control
+++ b/ubuntu/maverick/tdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, tdelibs14-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, tdelibs14-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdetoys-trinity
diff --git a/ubuntu/maverick/tdetoys/debian/patches/series b/ubuntu/maverick/tdetoys/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdetoys/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdetoys/debian/rules b/ubuntu/maverick/tdetoys/debian/rules
index da1268d9f..21108293f 100755
--- a/ubuntu/maverick/tdetoys/debian/rules
+++ b/ubuntu/maverick/tdetoys/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
diff --git a/ubuntu/maverick/tdeutils/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeutils/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/ubuntu/maverick/tdeutils/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeutils/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index 004be1738..fa4d66f75 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Standards-Version: 3.8.4
 
diff --git a/ubuntu/maverick/tdeutils/debian/patches/series b/ubuntu/maverick/tdeutils/debian/patches/series
new file mode 100644
index 000000000..f4421a4c2
--- /dev/null
+++ b/ubuntu/maverick/tdeutils/debian/patches/series
@@ -0,0 +1,5 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
+
+01-klaptopdaemon-setuphandler.diff
diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/maverick/tdeutils/debian/rules
index 19848196e..c7e800362 100755
--- a/ubuntu/maverick/tdeutils/debian/rules
+++ b/ubuntu/maverick/tdeutils/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
diff --git a/ubuntu/maverick/tdevelop/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdevelop/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/ubuntu/maverick/tdevelop/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdevelop/debian/cdbs/debian-qt-kde.mk
@@ -20,7 +20,9 @@ endif
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdevelop/debian/control b/ubuntu/maverick/tdevelop/debian/control
index c5ef6b183..bd615b9ef 100644
--- a/ubuntu/maverick/tdevelop/debian/control
+++ b/ubuntu/maverick/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), cmake, tdelibs14-trinity-dev, gettext, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), quilt, cmake, tdelibs14-trinity-dev, gettext, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdevelop-trinity
diff --git a/ubuntu/maverick/tdevelop/debian/patches/series b/ubuntu/maverick/tdevelop/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/tdevelop/debian/patches/series
@@ -0,0 +1,3 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules
index 95a3981ea..9d5bcbc87 100755
--- a/ubuntu/maverick/tdevelop/debian/rules
+++ b/ubuntu/maverick/tdevelop/debian/rules
@@ -7,7 +7,7 @@ makebuilddir::
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk
@@ -18,7 +18,9 @@ debian/stamp-cvs-make:
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/uploaders.mk
 
+ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
 
 DEB_KDE_ENABLE_FINAL := yes
 DEB_INSTALL_DOCS_ALL :=
diff --git a/ubuntu/maverick/tdewebdev/debian/control b/ubuntu/maverick/tdewebdev/debian/control
index 4dab927fb..099361776 100644
--- a/ubuntu/maverick/tdewebdev/debian/control
+++ b/ubuntu/maverick/tdewebdev/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://trinity.pearsoncomputing.net
 
diff --git a/ubuntu/maverick/tdewebdev/debian/patches/series b/ubuntu/maverick/tdewebdev/debian/patches/series
new file mode 100644
index 000000000..8f8f0bd6b
--- /dev/null
+++ b/ubuntu/maverick/tdewebdev/debian/patches/series
@@ -0,0 +1 @@
+common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdewebdev/debian/rules b/ubuntu/maverick/tdewebdev/debian/rules
index 1e601c5e2..46e21c610 100755
--- a/ubuntu/maverick/tdewebdev/debian/rules
+++ b/ubuntu/maverick/tdewebdev/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde