summaryrefslogtreecommitdiffstats
path: root/debian/squeeze/applications/adept
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-15 20:29:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-07-18 00:23:09 +0200
commitf025c10ab2c705f3b86669b3dae1817c0cdd6d1d (patch)
treee9ca489d65a931d999e375719a0ddd5d670b77f6 /debian/squeeze/applications/adept
parent17ce56f2601667a7515bbe21b4754cdb51f0d650 (diff)
downloadtde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.tar.gz
tde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.zip
Switch patch system from simple to quilt on Debian and Ubuntu
(cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf)
Diffstat (limited to 'debian/squeeze/applications/adept')
-rw-r--r--debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/squeeze/applications/adept/debian/patches/.gitignore0
-rwxr-xr-xdebian/squeeze/applications/adept/debian/rules2
3 files changed, 3 insertions, 1 deletions
diff --git a/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/adept/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/adept/debian/patches/.gitignore b/debian/squeeze/applications/adept/debian/patches/.gitignore
deleted file mode 100644
index e69de29bb..000000000
--- a/debian/squeeze/applications/adept/debian/patches/.gitignore
+++ /dev/null
diff --git a/debian/squeeze/applications/adept/debian/rules b/debian/squeeze/applications/adept/debian/rules
index aa5a629a7..2618af2fc 100755
--- a/debian/squeeze/applications/adept/debian/rules
+++ b/debian/squeeze/applications/adept/debian/rules
@@ -2,7 +2,7 @@
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
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man