Switch patch system from simple to quilt on Debian and Ubuntu

4 files changed, 7 insertions, 2 deletions

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