[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.7

Modestas Vainius modax at alioth.debian.org
Tue Mar 2 11:22:00 UTC 2010


The following commit has been merged in the master branch:
commit bb4c9b3fb77749bb98a18d9cc7c23156081fe5f7
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Mar 2 13:18:58 2010 +0200

    Instruct cdbs to handle DEB_BUILD_OPTIONS=parallel for team packages.
    
    Previous way relied on dpkg-buildpackage -jN to mess with MAKEFLAGS. Team
    packages are parallel safe.
---
 debian/changelog               |    3 +++
 qt-kde-team/1/debian-qt-kde.mk |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2c5551..bc66e9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 pkg-kde-tools (0.6.7) UNRELEASED; urgency=low
 
+  * Instruct cdbs to handle DEB_BUILD_OPTIONS=parallel for team packages rather
+    than rely on dpkg-buildpackage -jN to mess with MAKEFLAGS. Team packages
+    are parallel safe.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 02 Mar 2010 13:16:00 +0200
 
diff --git a/qt-kde-team/1/debian-qt-kde.mk b/qt-kde-team/1/debian-qt-kde.mk
index 2e40b98..567a16e 100644
--- a/qt-kde-team/1/debian-qt-kde.mk
+++ b/qt-kde-team/1/debian-qt-kde.mk
@@ -18,6 +18,9 @@ include $(DEB_PKG_KDE_QT_KDE_TEAM)/policy.mk
 # Link with --as-needed by default
 DEB_KDE_LINK_WITH_AS_NEEDED ?= yes
 
+# Our packages are parallel safe
+DEB_BUILD_PARALLEL = yes
+
 # Include default KDE 4 cmake configuration variables
 include $(DEB_PKG_KDE_MAKEFILES)/variables.mk
 

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list