Switch patch system from simple to quilt on Debian and Ubuntu

(cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf)

4 files changed, 7 insertions, 2 deletions

diff --git a/debian/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk
index f8b76cb04..4a9d74d88 100644
--- a/debian/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdetoys/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/debian/lenny/kdetoys/debian/control b/debian/lenny/kdetoys/debian/control
index 72b4fde14..9c549ba80 100644
--- a/debian/lenny/kdetoys/debian/control
+++ b/debian/lenny/kdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), 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, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdetoys-trinity
diff --git a/debian/lenny/kdetoys/debian/patches/series b/debian/lenny/kdetoys/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/debian/lenny/kdetoys/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/debian/lenny/kdetoys/debian/rules b/debian/lenny/kdetoys/debian/rules
index 1e3cc9f16..377649682 100755
--- a/debian/lenny/kdetoys/debian/rules
+++ b/debian/lenny/kdetoys/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