Switch patch system from simple to quilt on Debian and Ubuntu

10 files changed, 12 insertions, 4 deletions

diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/libraries/kipi-plugins/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/precise/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/precise/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/libraries/libkdcraw/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/precise/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/precise/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/libraries/libkexiv2/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/precise/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/precise/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/libraries/libkipi/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/precise/libraries/libkipi/debian/control b/ubuntu/precise/libraries/libkipi/debian/control
index ef0ce9d5c..7f4a700ce 100644
--- a/ubuntu/precise/libraries/libkipi/debian/control
+++ b/ubuntu/precise/libraries/libkipi/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 Uploaders: Achim Bohnet <[email protected]>, Mark Purcell <[email protected]>
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, libexif-dev, tdelibs14-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: libkipi0-trinity-dev
diff --git a/ubuntu/precise/libraries/libkipi/debian/patches/.gitignore b/ubuntu/precise/libraries/libkipi/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/precise/libraries/libkipi/debian/patches/.gitignore
+++ b/ubuntu/precise/libraries/libkipi/debian/patches/series
diff --git a/ubuntu/precise/libraries/libkipi/debian/rules b/ubuntu/precise/libraries/libkipi/debian/rules
index c95fe1343..9835b9048 100755
--- a/ubuntu/precise/libraries/libkipi/debian/rules
+++ b/ubuntu/precise/libraries/libkipi/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
diff --git a/ubuntu/precise/libraries/libtdeldap/debian/control b/ubuntu/precise/libraries/libtdeldap/debian/control
index 78bbffbc8..0f20c21ab 100644
--- a/ubuntu/precise/libraries/libtdeldap/debian/control
+++ b/ubuntu/precise/libraries/libtdeldap/debian/control
@@ -2,7 +2,7 @@ Source: libtdeldap-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libldap2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libldap2-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: libtdeldap-trinity
diff --git a/ubuntu/precise/libraries/libtdeldap/debian/patches/series b/ubuntu/precise/libraries/libtdeldap/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/precise/libraries/libtdeldap/debian/patches/series
diff --git a/ubuntu/precise/libraries/libtdeldap/debian/rules b/ubuntu/precise/libraries/libtdeldap/debian/rules
index 9bed17b05..e4abe53af 100755
--- a/ubuntu/precise/libraries/libtdeldap/debian/rules
+++ b/ubuntu/precise/libraries/libtdeldap/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk