Switch patch system from simple to quilt on Debian and Ubuntu

(cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf)

4 files changed, 4 insertions, 2 deletions

diff --git a/debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kde-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/debian/lenny/applications/kde-systemsettings/debian/control b/debian/lenny/applications/kde-systemsettings/debian/control
index 6d3d022c9..c92920c50 100644
--- a/debian/lenny/applications/kde-systemsettings/debian/control
+++ b/debian/lenny/applications/kde-systemsettings/debian/control
@@ -2,7 +2,7 @@ Source: kde-systemsettings-trinity
 Section: kde
 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), kdelibs4-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), kdelibs4-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kde-systemsettings-trinity
diff --git a/debian/lenny/applications/kde-systemsettings/debian/patches/.gitignore b/debian/lenny/applications/kde-systemsettings/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kde-systemsettings/debian/patches/.gitignore
+++ b/debian/lenny/applications/kde-systemsettings/debian/patches/series
diff --git a/debian/lenny/applications/kde-systemsettings/debian/rules b/debian/lenny/applications/kde-systemsettings/debian/rules
index fbfdf7a42..71831d1ad 100755
--- a/debian/lenny/applications/kde-systemsettings/debian/rules
+++ b/debian/lenny/applications/kde-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/kde