summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/applications/tde-systemsettings/debian
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 /ubuntu/raring/applications/tde-systemsettings/debian
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 'ubuntu/raring/applications/tde-systemsettings/debian')
-rw-r--r--ubuntu/raring/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/raring/applications/tde-systemsettings/debian/control2
-rw-r--r--ubuntu/raring/applications/tde-systemsettings/debian/patches/series (renamed from ubuntu/raring/applications/tde-systemsettings/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/raring/applications/tde-systemsettings/debian/rules2
4 files changed, 4 insertions, 2 deletions
diff --git a/ubuntu/raring/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 311dc059d..c807eed8c 100644
--- a/ubuntu/raring/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/applications/tde-systemsettings/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/tde-systemsettings/debian/control b/ubuntu/raring/applications/tde-systemsettings/debian/control
index fcda9cbaf..eb4b2305c 100644
--- a/ubuntu/raring/applications/tde-systemsettings/debian/control
+++ b/ubuntu/raring/applications/tde-systemsettings/debian/control
@@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), patchutils (>= 0.2.25), tdelibs14-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), quilt, patchutils (>= 0.2.25), tdelibs14-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: tde-systemsettings-trinity
diff --git a/ubuntu/raring/applications/tde-systemsettings/debian/patches/.gitignore b/ubuntu/raring/applications/tde-systemsettings/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/raring/applications/tde-systemsettings/debian/patches/.gitignore
+++ b/ubuntu/raring/applications/tde-systemsettings/debian/patches/series
diff --git a/ubuntu/raring/applications/tde-systemsettings/debian/rules b/ubuntu/raring/applications/tde-systemsettings/debian/rules
index ed2e13a90..7e11dd034 100755
--- a/ubuntu/raring/applications/tde-systemsettings/debian/rules
+++ b/ubuntu/raring/applications/tde-systemsettings/debian/rules
@@ -3,7 +3,7 @@
cdbs_kde_enable_debug = --disable-debug
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde