[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.8.0-4-gc8ba196

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 71805be2b04208196ec1359807dba8524eb5f3fb
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu May 27 11:06:55 2010 +0300

    qt-kde-team/1/debian-qt-kde.mk: enable quilt patchsystem only if quilt is in Build-Depends.
    
    This adds support for 3.0 (quilt) source format.
---
 debian/changelog               |    2 ++
 qt-kde-team/1/debian-qt-kde.mk |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5445adb..4c86e25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pkg-kde-tools (0.8.1) UNRELEASED; urgency=low
 
   * Drop deprecated `pkgkde-symbolshelper symbolfile` support from
     cdbs/symbolshelper.mk.
+  * qt-kde-team/1/debian-qt-kde.mk: enable quilt patchsystem only if 
+    quilt is in Build-Depends. This adds support for 3.0 (quilt) source format.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 25 May 2010 17:31:29 +0300
 
diff --git a/qt-kde-team/1/debian-qt-kde.mk b/qt-kde-team/1/debian-qt-kde.mk
index 567a16e..5381e37 100644
--- a/qt-kde-team/1/debian-qt-kde.mk
+++ b/qt-kde-team/1/debian-qt-kde.mk
@@ -3,9 +3,14 @@ _cdbs_debian_qt_kde = 1
 
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+# If quilt is in Build-Depends, enable quilt patch system support
+# for 1.0 format.
+ifneq ($(shell sed -n '/^Build-Depends: / { : lookforquilt { /\bquilt\b/ { p; b; }; n; /^[[:space:]]\+/ { b lookforquilt };  } }' debian/control),)
+    include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+endif
+
 DEB_PKG_KDE_DATA := /usr/share/pkg-kde-tools
 DEB_PKG_KDE_MAKEFILES := $(DEB_PKG_KDE_DATA)/makefiles/1
 DEB_PKG_KDE_QT_KDE_TEAM := $(DEB_PKG_KDE_DATA)/qt-kde-team/1

-- 
Debian Qt/KDE packaging tools