From f025c10ab2c705f3b86669b3dae1817c0cdd6d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 15 Sep 2013 20:29:47 +0200 Subject: Switch patch system from simple to quilt on Debian and Ubuntu (cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf) --- debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/squeeze/kdeadmin/debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/squeeze/kdeadmin') diff --git a/debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk index 4a11bc028..6b7b16643 100644 --- a/debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/kdeadmin/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/kdeadmin/debian/rules b/debian/squeeze/kdeadmin/debian/rules index 52fa58219..9a3c17683 100755 --- a/debian/squeeze/kdeadmin/debian/rules +++ b/debian/squeeze/kdeadmin/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/kde -- cgit v1.2.3