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/raring/tdevelop/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/raring/tdevelop/debian/control | 2 +- ubuntu/raring/tdevelop/debian/patches/series | 3 +++ ubuntu/raring/tdevelop/debian/rules | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 ubuntu/raring/tdevelop/debian/patches/series (limited to 'ubuntu/raring/tdevelop/debian') diff --git a/ubuntu/raring/tdevelop/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdevelop/debian/cdbs/debian-qt-kde.mk index f8b76cb04..4a9d74d88 100644 --- a/ubuntu/raring/tdevelop/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/tdevelop/debian/cdbs/debian-qt-kde.mk @@ -20,7 +20,9 @@ endif 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/raring/tdevelop/debian/control b/ubuntu/raring/tdevelop/debian/control index c5ef6b183..bd615b9ef 100644 --- a/ubuntu/raring/tdevelop/debian/control +++ b/ubuntu/raring/tdevelop/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Jeremy Lain -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), cmake, tdelibs14-trinity-dev, gettext, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), quilt, cmake, tdelibs14-trinity-dev, gettext, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdevelop-trinity diff --git a/ubuntu/raring/tdevelop/debian/patches/series b/ubuntu/raring/tdevelop/debian/patches/series new file mode 100644 index 000000000..6b3ddc8ec --- /dev/null +++ b/ubuntu/raring/tdevelop/debian/patches/series @@ -0,0 +1,3 @@ +common/04_am_maintainer_mode.diff +common/06_disable_no_undefined.diff +common/kubuntu_01_kdepot.diff diff --git a/ubuntu/raring/tdevelop/debian/rules b/ubuntu/raring/tdevelop/debian/rules index 95a3981ea..9d5bcbc87 100755 --- a/ubuntu/raring/tdevelop/debian/rules +++ b/ubuntu/raring/tdevelop/debian/rules @@ -7,7 +7,7 @@ makebuilddir:: include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.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 -- cgit v1.2.1