From f24915471ea396c53670df51b2affc4af74373bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 15 Sep 2013 20:29:47 +0200 Subject: Switch patch system from simple to quilt on Debian and Ubuntu --- ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/kasablanca/debian/control | 2 +- ubuntu/maverick/applications/kasablanca/debian/patches/series | 2 ++ ubuntu/maverick/applications/kasablanca/debian/rules | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 ubuntu/maverick/applications/kasablanca/debian/patches/series (limited to 'ubuntu/maverick/applications/kasablanca/debian') diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk index ba002080b..f72df2152 100644 --- a/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/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/maverick/applications/kasablanca/debian/control b/ubuntu/maverick/applications/kasablanca/debian/control index 0e8aed6ad..01515bd06 100644 --- a/ubuntu/maverick/applications/kasablanca/debian/control +++ b/ubuntu/maverick/applications/kasablanca/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Debian TDE Extras Team Uploaders: Fathi Boudra , Mark Purcell -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/maverick/applications/kasablanca/debian/patches/series b/ubuntu/maverick/applications/kasablanca/debian/patches/series new file mode 100644 index 000000000..b8743ddd9 --- /dev/null +++ b/ubuntu/maverick/applications/kasablanca/debian/patches/series @@ -0,0 +1,2 @@ +04_am_maintainer_mode.diff +06_disable_no_undefined.diff diff --git a/ubuntu/maverick/applications/kasablanca/debian/rules b/ubuntu/maverick/applications/kasablanca/debian/rules index 76e30e3f1..e12e8b448 100755 --- a/ubuntu/maverick/applications/kasablanca/debian/rules +++ b/ubuntu/maverick/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 -- cgit v1.2.3