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 --- ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/tdepim/debian/control | 2 +- ubuntu/maverick/tdepim/debian/patches/.gitignore | 0 ubuntu/maverick/tdepim/debian/patches/series | 0 ubuntu/maverick/tdepim/debian/rules | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 ubuntu/maverick/tdepim/debian/patches/.gitignore create mode 100644 ubuntu/maverick/tdepim/debian/patches/series (limited to 'ubuntu/maverick/tdepim/debian') diff --git a/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk index fa0d532f4..ec89756bb 100644 --- a/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk @@ -15,7 +15,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/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control index 6a06bda38..3bdcc7478 100644 --- a/ubuntu/maverick/tdepim/debian/control +++ b/ubuntu/maverick/tdepim/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Josh Metzler , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cdparanoia, gawk, gettext, tdelibs14-trinity-dev, bison, byacc, bzip2, flex, groff-base, libopensync0-dev, libogg-dev, libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev, diff --git a/ubuntu/maverick/tdepim/debian/patches/.gitignore b/ubuntu/maverick/tdepim/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/tdepim/debian/patches/series b/ubuntu/maverick/tdepim/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules index 48c8b7fa2..e01240a19 100755 --- a/ubuntu/maverick/tdepim/debian/rules +++ b/ubuntu/maverick/tdepim/debian/rules @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 include debian/cdbs/debian-qt-kde.mk -- cgit v1.2.1