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) --- ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/kdevelop.cmake/debian/control | 2 +- ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore | 0 ubuntu/maverick/kdevelop.cmake/debian/patches/series | 0 ubuntu/maverick/kdevelop.cmake/debian/rules | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore create mode 100644 ubuntu/maverick/kdevelop.cmake/debian/patches/series (limited to 'ubuntu/maverick/kdevelop.cmake/debian') diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk index 4a11bc028..6b7b16643 100644 --- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/kdevelop.cmake/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/ubuntu/maverick/kdevelop.cmake/debian/control b/ubuntu/maverick/kdevelop.cmake/debian/control index fe8eec312..306735c66 100644 --- a/ubuntu/maverick/kdevelop.cmake/debian/control +++ b/ubuntu/maverick/kdevelop.cmake/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Jeremy Lain -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), qt3-apps-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, cmake, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), quilt, qt3-apps-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, cmake, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdevelop-trinity diff --git a/ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore b/ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/kdevelop.cmake/debian/patches/series b/ubuntu/maverick/kdevelop.cmake/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/maverick/kdevelop.cmake/debian/rules b/ubuntu/maverick/kdevelop.cmake/debian/rules index 0bf8bfe14..11117a1b3 100755 --- a/ubuntu/maverick/kdevelop.cmake/debian/rules +++ b/ubuntu/maverick/kdevelop.cmake/debian/rules @@ -6,7 +6,7 @@ makebuilddir:: 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