summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/applications/kasablanca
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/kasablanca
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/kasablanca')
-rw-r--r--ubuntu/raring/applications/kasablanca/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/raring/applications/kasablanca/debian/control2
-rw-r--r--ubuntu/raring/applications/kasablanca/debian/patches/series2
-rwxr-xr-xubuntu/raring/applications/kasablanca/debian/rules2
4 files changed, 6 insertions, 2 deletions
diff --git a/ubuntu/raring/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
index ba002080b..f72df2152 100644
--- a/ubuntu/raring/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/applications/kasablanca/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/kasablanca/debian/control b/ubuntu/raring/applications/kasablanca/debian/control
index 0e8aed6ad..01515bd06 100644
--- a/ubuntu/raring/applications/kasablanca/debian/control
+++ b/ubuntu/raring/applications/kasablanca/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Debian TDE Extras Team <pkg-tde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
+Build-Depends: cdbs, debhelper (>= 5), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
Standards-Version: 3.8.3
Package: kasablanca-trinity
diff --git a/ubuntu/raring/applications/kasablanca/debian/patches/series b/ubuntu/raring/applications/kasablanca/debian/patches/series
new file mode 100644
index 000000000..b8743ddd9
--- /dev/null
+++ b/ubuntu/raring/applications/kasablanca/debian/patches/series
@@ -0,0 +1,2 @@
+04_am_maintainer_mode.diff
+06_disable_no_undefined.diff
diff --git a/ubuntu/raring/applications/kasablanca/debian/rules b/ubuntu/raring/applications/kasablanca/debian/rules
index 76e30e3f1..e12e8b448 100755
--- a/ubuntu/raring/applications/kasablanca/debian/rules
+++ b/ubuntu/raring/applications/kasablanca/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
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man