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/precise/applications/koffice/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/precise/applications/koffice/debian/control | 2 +- ubuntu/precise/applications/koffice/debian/patches/.gitignore | 0 ubuntu/precise/applications/koffice/debian/patches/series | 0 ubuntu/precise/applications/koffice/debian/rules | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 ubuntu/precise/applications/koffice/debian/patches/.gitignore create mode 100644 ubuntu/precise/applications/koffice/debian/patches/series (limited to 'ubuntu/precise/applications/koffice/debian') diff --git a/ubuntu/precise/applications/koffice/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/koffice/debian/cdbs/debian-qt-kde.mk index b93e7c154..a803f50d6 100644 --- a/ubuntu/precise/applications/koffice/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/applications/koffice/debian/cdbs/debian-qt-kde.mk @@ -18,7 +18,9 @@ debian/stamp-cvs-make: include debian/cdbs/kde.mk 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/precise/applications/koffice/debian/control b/ubuntu/precise/applications/koffice/debian/control index 6d2e73b8c..4b2f86587 100644 --- a/ubuntu/precise/applications/koffice/debian/control +++ b/ubuntu/precise/applications/koffice/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Ral Snchez Siles -Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.4 Homepage: http://www.koffice.org diff --git a/ubuntu/precise/applications/koffice/debian/patches/.gitignore b/ubuntu/precise/applications/koffice/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/precise/applications/koffice/debian/patches/series b/ubuntu/precise/applications/koffice/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/precise/applications/koffice/debian/rules b/ubuntu/precise/applications/koffice/debian/rules index ed91a11c3..495d85db8 100755 --- a/ubuntu/precise/applications/koffice/debian/rules +++ b/ubuntu/precise/applications/koffice/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/tde -- cgit v1.2.1