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/raring/tdeartwork/debian/cdbs/debian-qt-kde.mk | 2 ++ ubuntu/raring/tdeartwork/debian/control | 2 +- ubuntu/raring/tdeartwork/debian/patches/series | 0 ubuntu/raring/tdeartwork/debian/rules | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 ubuntu/raring/tdeartwork/debian/patches/series (limited to 'ubuntu/raring/tdeartwork/debian') diff --git a/ubuntu/raring/tdeartwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdeartwork/debian/cdbs/debian-qt-kde.mk index 497be9751..425264528 100644 --- a/ubuntu/raring/tdeartwork/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/tdeartwork/debian/cdbs/debian-qt-kde.mk @@ -20,7 +20,9 @@ endif 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/tdeartwork/debian/control b/ubuntu/raring/tdeartwork/debian/control index 71e85c054..ce11a9c95 100644 --- a/ubuntu/raring/tdeartwork/debian/control +++ b/ubuntu/raring/tdeartwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Sune Vuorela -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, tdelibs14-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, tdelibs14-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.8.4 diff --git a/ubuntu/raring/tdeartwork/debian/patches/series b/ubuntu/raring/tdeartwork/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/raring/tdeartwork/debian/rules b/ubuntu/raring/tdeartwork/debian/rules index 963f996bc..062bd4f29 100755 --- a/ubuntu/raring/tdeartwork/debian/rules +++ b/ubuntu/raring/tdeartwork/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-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 -- cgit v1.2.1