summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-07-14 20:09:16 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-07-23 23:18:56 +0200
commit9b4bbce845a009514c26d1d81f0adddfbfd1f44b (patch)
tree30d71a06d1f5dbf3b46bc9aa799193280c262ecb /ubuntu
parentd45c4a434bab855246c7e51812cc852215a7c44b (diff)
downloadtde-packaging-9b4bbce845a009514c26d1d81f0adddfbfd1f44b.tar.gz
tde-packaging-9b4bbce845a009514c26d1d81f0adddfbfd1f44b.zip
Superseded former way of managing patches for kdevelop on Debian and Ubuntu
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/kdevelop/debian/control2
-rw-r--r--ubuntu/maverick/kdevelop/debian/patches/series3
-rwxr-xr-xubuntu/maverick/kdevelop/debian/rules2
3 files changed, 5 insertions, 2 deletions
diff --git a/ubuntu/maverick/kdevelop/debian/control b/ubuntu/maverick/kdevelop/debian/control
index a5a40986f..8227ced3f 100644
--- a/ubuntu/maverick/kdevelop/debian/control
+++ b/ubuntu/maverick/kdevelop/debian/control
@@ -3,7 +3,7 @@ Section: kde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), quilt, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdevelop-trinity
diff --git a/ubuntu/maverick/kdevelop/debian/patches/series b/ubuntu/maverick/kdevelop/debian/patches/series
new file mode 100644
index 000000000..6b3ddc8ec
--- /dev/null
+++ b/ubuntu/maverick/kdevelop/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/maverick/kdevelop/debian/rules b/ubuntu/maverick/kdevelop/debian/rules
index 9c61d0589..a2224b765 100755
--- a/ubuntu/maverick/kdevelop/debian/rules
+++ b/ubuntu/maverick/kdevelop/debian/rules
@@ -6,7 +6,7 @@ makebuilddir::
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/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde