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/dolphin/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/maverick/applications/dolphin/debian/control | 2 +- ubuntu/maverick/applications/dolphin/debian/patches/.gitignore | 0 ubuntu/maverick/applications/dolphin/debian/patches/series | 0 ubuntu/maverick/applications/dolphin/debian/rules | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 ubuntu/maverick/applications/dolphin/debian/patches/.gitignore create mode 100644 ubuntu/maverick/applications/dolphin/debian/patches/series (limited to 'ubuntu/maverick/applications/dolphin/debian') diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk index 345cc0a61..fb36ac52f 100644 --- a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/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/maverick/applications/dolphin/debian/control b/ubuntu/maverick/applications/dolphin/debian/control index fcbd2594e..27502f3d7 100644 --- a/ubuntu/maverick/applications/dolphin/debian/control +++ b/ubuntu/maverick/applications/dolphin/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Anthony Mercatante -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/maverick/applications/dolphin/debian/patches/.gitignore b/ubuntu/maverick/applications/dolphin/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/maverick/applications/dolphin/debian/patches/series b/ubuntu/maverick/applications/dolphin/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/maverick/applications/dolphin/debian/rules b/ubuntu/maverick/applications/dolphin/debian/rules index 66ea98891..f978c418e 100755 --- a/ubuntu/maverick/applications/dolphin/debian/rules +++ b/ubuntu/maverick/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 -- cgit v1.2.1