summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/applications/dolphin/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/precise/applications/dolphin/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/precise/applications/dolphin/debian')
-rw-r--r--ubuntu/precise/applications/dolphin/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/precise/applications/dolphin/debian/control2
-rw-r--r--ubuntu/precise/applications/dolphin/debian/patches/series (renamed from ubuntu/precise/applications/dolphin/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/precise/applications/dolphin/debian/rules2
4 files changed, 4 insertions, 2 deletions
diff --git a/ubuntu/precise/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/dolphin/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..fb36ac52f 100644
--- a/ubuntu/precise/applications/dolphin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/applications/dolphin/debian/cdbs/debian-qt-kde.mk
@@ -15,7 +15,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/precise/applications/dolphin/debian/control b/ubuntu/precise/applications/dolphin/debian/control
index fcbd2594e..27502f3d7 100644
--- a/ubuntu/precise/applications/dolphin/debian/control
+++ b/ubuntu/precise/applications/dolphin/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake
Standards-Version: 3.8.4
Package: dolphin-trinity
diff --git a/ubuntu/precise/applications/dolphin/debian/patches/.gitignore b/ubuntu/precise/applications/dolphin/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/precise/applications/dolphin/debian/patches/.gitignore
+++ b/ubuntu/precise/applications/dolphin/debian/patches/series
diff --git a/ubuntu/precise/applications/dolphin/debian/rules b/ubuntu/precise/applications/dolphin/debian/rules
index 66ea98891..f978c418e 100755
--- a/ubuntu/precise/applications/dolphin/debian/rules
+++ b/ubuntu/precise/applications/dolphin/debian/rules
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
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