summaryrefslogtreecommitdiffstats
path: root/debian/wheezy/applications/koffice
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-15 20:29:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-15 20:29:47 +0200
commitf24915471ea396c53670df51b2affc4af74373bf (patch)
tree04e25e027d641ad6b82ba5828ae9a9c72924b1f1 /debian/wheezy/applications/koffice
parent1c7a831407fea1378682db5c21b06e792343be06 (diff)
downloadtde-packaging-f24915471ea396c53670df51b2affc4af74373bf.tar.gz
tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.zip
Switch patch system from simple to quilt on Debian and Ubuntu
Diffstat (limited to 'debian/wheezy/applications/koffice')
-rw-r--r--debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/wheezy/applications/koffice/debian/control2
-rw-r--r--debian/wheezy/applications/koffice/debian/patches/series (renamed from debian/wheezy/applications/koffice/debian/patches/.gitignore)0
-rwxr-xr-xdebian/wheezy/applications/koffice/debian/rules2
4 files changed, 4 insertions, 2 deletions
diff --git a/debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk
index b93e7c154..a803f50d6 100644
--- a/debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/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/debian/wheezy/applications/koffice/debian/control b/debian/wheezy/applications/koffice/debian/control
index ed66aecc6..57604185f 100644
--- a/debian/wheezy/applications/koffice/debian/control
+++ b/debian/wheezy/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
-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/debian/wheezy/applications/koffice/debian/patches/.gitignore b/debian/wheezy/applications/koffice/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/wheezy/applications/koffice/debian/patches/.gitignore
+++ b/debian/wheezy/applications/koffice/debian/patches/series
diff --git a/debian/wheezy/applications/koffice/debian/rules b/debian/wheezy/applications/koffice/debian/rules
index ed91a11c3..495d85db8 100755
--- a/debian/wheezy/applications/koffice/debian/rules
+++ b/debian/wheezy/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