From f24915471ea396c53670df51b2affc4af74373bf 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 --- debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk | 2 ++ debian/squeeze/applications/kerry/debian/control | 2 +- debian/squeeze/applications/kerry/debian/patches/series | 0 debian/squeeze/applications/kerry/debian/rules | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 debian/squeeze/applications/kerry/debian/patches/series (limited to 'debian/squeeze/applications/kerry') diff --git a/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk index 4a11bc028..6b7b16643 100644 --- a/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/kerry/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/kerry/debian/control b/debian/squeeze/applications/kerry/debian/control index 432af377d..5f6563c67 100644 --- a/debian/squeeze/applications/kerry/debian/control +++ b/debian/squeeze/applications/kerry/debian/control @@ -2,7 +2,7 @@ Source: kerry-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 5.0.0), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev Homepage: http://en.opensuse.org/Kerry Standards-Version: 3.8.4 diff --git a/debian/squeeze/applications/kerry/debian/patches/series b/debian/squeeze/applications/kerry/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/debian/squeeze/applications/kerry/debian/rules b/debian/squeeze/applications/kerry/debian/rules index dea466c17..7b26c5eb5 100755 --- a/debian/squeeze/applications/kerry/debian/rules +++ b/debian/squeeze/applications/kerry/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 /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk -- cgit v1.2.1