From f24915471ea396c53670df51b2affc4af74373bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 15 Sep 2013 20:29:47 +0200
Subject: Switch patch system from simple to quilt on Debian and Ubuntu

---
 debian/squeeze/applications/tdesudo/debian/cdbs/debian-qt-kde.mk | 2 ++
 debian/squeeze/applications/tdesudo/debian/control               | 2 +-
 debian/squeeze/applications/tdesudo/debian/patches/.gitignore    | 0
 debian/squeeze/applications/tdesudo/debian/patches/series        | 0
 debian/squeeze/applications/tdesudo/debian/rules                 | 2 +-
 5 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 debian/squeeze/applications/tdesudo/debian/patches/.gitignore
 create mode 100644 debian/squeeze/applications/tdesudo/debian/patches/series

(limited to 'debian/squeeze/applications/tdesudo')

diff --git a/debian/squeeze/applications/tdesudo/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdesudo/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/squeeze/applications/tdesudo/debian/control b/debian/squeeze/applications/tdesudo/debian/control
index c5ef4bdee..f71c78ab3 100644
--- a/debian/squeeze/applications/tdesudo/debian/control
+++ b/debian/squeeze/applications/tdesudo/debian/control
@@ -2,7 +2,7 @@ Source: tdesudo-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>> 5), cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdesudo-trinity
diff --git a/debian/squeeze/applications/tdesudo/debian/patches/.gitignore b/debian/squeeze/applications/tdesudo/debian/patches/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/debian/squeeze/applications/tdesudo/debian/patches/series b/debian/squeeze/applications/tdesudo/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
diff --git a/debian/squeeze/applications/tdesudo/debian/rules b/debian/squeeze/applications/tdesudo/debian/rules
index 443a43aed..83c31e0c9 100755
--- a/debian/squeeze/applications/tdesudo/debian/rules
+++ b/debian/squeeze/applications/tdesudo/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
-- 
cgit v1.2.1