summaryrefslogtreecommitdiffstats
path: root/debian/wheezy/tdewebdev
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/tdewebdev
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/tdewebdev')
-rw-r--r--debian/wheezy/tdewebdev/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--debian/wheezy/tdewebdev/debian/control2
-rw-r--r--debian/wheezy/tdewebdev/debian/patches/series1
-rwxr-xr-xdebian/wheezy/tdewebdev/debian/rules2
4 files changed, 5 insertions, 2 deletions
diff --git a/debian/wheezy/tdewebdev/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdewebdev/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/debian/wheezy/tdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdewebdev/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/debian/wheezy/tdewebdev/debian/control b/debian/wheezy/tdewebdev/debian/control
index c1cf6d923..565d755ad 100644
--- a/debian/wheezy/tdewebdev/debian/control
+++ b/debian/wheezy/tdewebdev/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: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libreadline5-dev | libreadline6-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://trinity.pearsoncomputing.net
diff --git a/debian/wheezy/tdewebdev/debian/patches/series b/debian/wheezy/tdewebdev/debian/patches/series
new file mode 100644
index 000000000..8f8f0bd6b
--- /dev/null
+++ b/debian/wheezy/tdewebdev/debian/patches/series
@@ -0,0 +1 @@
+common/kubuntu_01_kdepot.diff
diff --git a/debian/wheezy/tdewebdev/debian/rules b/debian/wheezy/tdewebdev/debian/rules
index 1e601c5e2..46e21c610 100755
--- a/debian/wheezy/tdewebdev/debian/rules
+++ b/debian/wheezy/tdewebdev/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