summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/kdevelop.cmake/debian
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick/kdevelop.cmake/debian')
-rw-r--r--ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/maverick/kdevelop.cmake/debian/control2
-rw-r--r--ubuntu/maverick/kdevelop.cmake/debian/patches/series (renamed from ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/maverick/kdevelop.cmake/debian/rules2
4 files changed, 4 insertions, 2 deletions
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
index 4a11bc028..6b7b16643 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdevelop.cmake/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/ubuntu/maverick/kdevelop.cmake/debian/control b/ubuntu/maverick/kdevelop.cmake/debian/control
index fe8eec312..306735c66 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/control
+++ b/ubuntu/maverick/kdevelop.cmake/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), qt3-apps-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, cmake, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), quilt, qt3-apps-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gettext, kdelibs4-trinity-doc, qt3-doc, flex, python, libcvsservice-trinity-dev (>= 4:3.5.10), groff-base, libsvn-dev, libaprutil1-dev, cmake, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdevelop-trinity
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore b/ubuntu/maverick/kdevelop.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/patches/.gitignore
+++ b/ubuntu/maverick/kdevelop.cmake/debian/patches/series
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/rules b/ubuntu/maverick/kdevelop.cmake/debian/rules
index 0bf8bfe14..11117a1b3 100755
--- a/ubuntu/maverick/kdevelop.cmake/debian/rules
+++ b/ubuntu/maverick/kdevelop.cmake/debian/rules
@@ -6,7 +6,7 @@ makebuilddir::
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.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
include debian/cdbs/debian-qt-kde.mk