Switch patch system from simple to quilt on Debian and Ubuntu

4 files changed, 4 insertions, 2 deletions

diff --git a/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
index 5e704aa4a..c5d8ecfd3 100644
--- a/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,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/rosegarden/debian/control b/debian/lenny/applications/rosegarden/debian/control
index 3b0310398..386c0f7db 100644
--- a/debian/lenny/applications/rosegarden/debian/control
+++ b/debian/lenny/applications/rosegarden/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
 Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org>
-Build-Depends: debhelper (>> 5.0.0), cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
+Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev
 Standards-Version: 3.8.4
 Homepage: http://www.rosegardenmusic.com/
 
diff --git a/debian/lenny/applications/rosegarden/debian/patches/.gitignore b/debian/lenny/applications/rosegarden/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/rosegarden/debian/patches/.gitignore
+++ b/debian/lenny/applications/rosegarden/debian/patches/series
diff --git a/debian/lenny/applications/rosegarden/debian/rules b/debian/lenny/applications/rosegarden/debian/rules
index 3fc2b777e..1bac8145d 100755
--- a/debian/lenny/applications/rosegarden/debian/rules
+++ b/debian/lenny/applications/rosegarden/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.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
 include debian/cdbs/debian-qt-kde.mk