summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/applications/adept
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/raring/applications/adept')
-rw-r--r--ubuntu/raring/applications/adept/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/raring/applications/adept/debian/control2
-rw-r--r--ubuntu/raring/applications/adept/debian/patches/series (renamed from ubuntu/raring/applications/adept/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/raring/applications/adept/debian/rules2
4 files changed, 4 insertions, 2 deletions
diff --git a/ubuntu/raring/applications/adept/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/adept/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/raring/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/applications/adept/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/raring/applications/adept/debian/control b/ubuntu/raring/applications/adept/debian/control
index 85debf475..a51c16730 100644
--- a/ubuntu/raring/applications/adept/debian/control
+++ b/ubuntu/raring/applications/adept/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Peter Rockai <me@mornfall.net>
Uploaders: Isaac Clerencia <isaac@debian.org>, Enrico Zini <enrico@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: adept-trinity
diff --git a/ubuntu/raring/applications/adept/debian/patches/.gitignore b/ubuntu/raring/applications/adept/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/raring/applications/adept/debian/patches/.gitignore
+++ b/ubuntu/raring/applications/adept/debian/patches/series
diff --git a/ubuntu/raring/applications/adept/debian/rules b/ubuntu/raring/applications/adept/debian/rules
index 742307eb6..0e554102b 100755
--- a/ubuntu/raring/applications/adept/debian/rules
+++ b/ubuntu/raring/applications/adept/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man