Switch patch system from simple to quilt on Debian and Ubuntu

4 files changed, 4 insertions, 2 deletions

diff --git a/debian/wheezy/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/wheezy/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/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/debian/wheezy/applications/k9copy/debian/control b/debian/wheezy/applications/k9copy/debian/control
index b166a14fd..5b895ca12 100644
--- a/debian/wheezy/applications/k9copy/debian/control
+++ b/debian/wheezy/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Anthony Mercatante <[email protected]>
-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/debian/wheezy/applications/k9copy/debian/patches/.gitignore b/debian/wheezy/applications/k9copy/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/wheezy/applications/k9copy/debian/patches/.gitignore
+++ b/debian/wheezy/applications/k9copy/debian/patches/series
diff --git a/debian/wheezy/applications/k9copy/debian/rules b/debian/wheezy/applications/k9copy/debian/rules
index 9d406d017..365bf8ac6 100755
--- a/debian/wheezy/applications/k9copy/debian/rules
+++ b/debian/wheezy/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