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/precise/applications/kaffeine/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/precise/applications/kaffeine/debian/control | 2 +- ubuntu/precise/applications/kaffeine/debian/patches/.gitignore | 0 ubuntu/precise/applications/kaffeine/debian/patches/series | 0 ubuntu/precise/applications/kaffeine/debian/rules | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 ubuntu/precise/applications/kaffeine/debian/patches/.gitignore create mode 100644 ubuntu/precise/applications/kaffeine/debian/patches/series (limited to 'ubuntu/precise/applications/kaffeine') diff --git a/ubuntu/precise/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/kaffeine/debian/cdbs/debian-qt-kde.mk index 311dc059d..c807eed8c 100644 --- a/ubuntu/precise/applications/kaffeine/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/applications/kaffeine/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/precise/applications/kaffeine/debian/control b/ubuntu/precise/applications/kaffeine/debian/control index 3141b6908..b558621cd 100644 --- a/ubuntu/precise/applications/kaffeine/debian/control +++ b/ubuntu/precise/applications/kaffeine/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Riku Voipio , Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev, libxtst-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libcdio-cdda-dev, libcdio-paranoia-dev, diff --git a/ubuntu/precise/applications/kaffeine/debian/patches/.gitignore b/ubuntu/precise/applications/kaffeine/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/ubuntu/precise/applications/kaffeine/debian/patches/series b/ubuntu/precise/applications/kaffeine/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/precise/applications/kaffeine/debian/rules b/ubuntu/precise/applications/kaffeine/debian/rules index 5087a0863..3afb59271 100755 --- a/ubuntu/precise/applications/kaffeine/debian/rules +++ b/ubuntu/precise/applications/kaffeine/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 include /usr/share/cdbs/1/rules/utils.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -- cgit v1.2.1