diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-15 20:29:47 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-15 20:29:47 +0200 |
| commit | f24915471ea396c53670df51b2affc4af74373bf (patch) | |
| tree | 04e25e027d641ad6b82ba5828ae9a9c72924b1f1 /debian/wheezy/applications/kasablanca | |
| parent | 1c7a831407fea1378682db5c21b06e792343be06 (diff) | |
| download | tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.tar.gz tde-packaging-f24915471ea396c53670df51b2affc4af74373bf.zip | |
Switch patch system from simple to quilt on Debian and Ubuntu
Diffstat (limited to 'debian/wheezy/applications/kasablanca')
4 files changed, 6 insertions, 2 deletions
diff --git a/debian/wheezy/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kasablanca/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/debian/wheezy/applications/kasablanca/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/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/debian/wheezy/applications/kasablanca/debian/control b/debian/wheezy/applications/kasablanca/debian/control index 0e8aed6ad..01515bd06 100644 --- a/debian/wheezy/applications/kasablanca/debian/control +++ b/debian/wheezy/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/debian/wheezy/applications/kasablanca/debian/patches/series b/debian/wheezy/applications/kasablanca/debian/patches/series new file mode 100644 index 000000000..b8743ddd9 --- /dev/null +++ b/debian/wheezy/applications/kasablanca/debian/patches/series @@ -0,0 +1,2 @@ +04_am_maintainer_mode.diff +06_disable_no_undefined.diff diff --git a/debian/wheezy/applications/kasablanca/debian/rules b/debian/wheezy/applications/kasablanca/debian/rules index 76e30e3f1..e12e8b448 100755 --- a/debian/wheezy/applications/kasablanca/debian/rules +++ b/debian/wheezy/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 |