Switch patch system from simple to quilt on Debian and Ubuntu

4 files changed, 4 insertions, 2 deletions

diff --git a/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/lenny/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/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/debian/lenny/applications/gwenview/debian/control b/debian/lenny/applications/gwenview/debian/control
index 359bad80c..296502cdb 100644
--- a/debian/lenny/applications/gwenview/debian/control
+++ b/debian/lenny/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/debian/lenny/applications/gwenview/debian/patches/.gitignore b/debian/lenny/applications/gwenview/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/gwenview/debian/patches/.gitignore
+++ b/debian/lenny/applications/gwenview/debian/patches/series
diff --git a/debian/lenny/applications/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules
index 2fca00e50..943f33d55 100755
--- a/debian/lenny/applications/gwenview/debian/rules
+++ b/debian/lenny/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