[SCM] Debian Qt/KDE packaging tools branch, improved-gensymbols, updated. debian/0.5.3-17-g9e83174

Modestas Vainius modax at alioth.debian.org
Sat Jan 9 18:17:40 UTC 2010


The following commit has been merged in the improved-gensymbols branch:
commit 7ef232e6fb5806bfce29bb7574e142bc85f828a8
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Jan 9 18:58:36 2010 +0200

    Make cdbs/symbolshelper.mk add /usr/share/pkg-kde-tools/bin to $PATH.
---
 debian/changelog                  |    1 +
 makefiles/1/cdbs/symbolshelper.mk |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b6281b4..ebd987d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pkg-kde-tools (0.6.0~pre2) UNRELEASED; urgency=low
   * Make it possible to replace dpkg-gensymbols with pkgkde-gensymbols
     (by adding /usr/share/pkg-kde-tools/bin to $PATH).
   * Use my @debian.org address in the Uploaders field.
+  * Make cdbs/symbolshelper.mk add /usr/share/pkg-kde-tools/bin to $PATH.
 
  -- Modestas Vainius <modestas at vainius.eu>  Sun, 06 Dec 2009 22:06:01 +0200
 
diff --git a/makefiles/1/cdbs/symbolshelper.mk b/makefiles/1/cdbs/symbolshelper.mk
index 7d76de9..5892f95 100644
--- a/makefiles/1/cdbs/symbolshelper.mk
+++ b/makefiles/1/cdbs/symbolshelper.mk
@@ -3,6 +3,10 @@ include /usr/share/cdbs/1/rules/buildvars.mk
 ifndef _cdbs_pkgkde_symbolshelper
 _cdbs_pkgkde_symbolshelper = 1
 
+ifneq (/usr/share/pkg-kde-tools/bin,$(filter /usr/share/pkg-kde-tools/bin,$(subst :, ,$(PATH))))
+    export PATH := /usr/share/pkg-kde-tools/bin:$(PATH)
+endif
+
 SYMBOLSHELPER_PACKAGES := $(filter $(DEB_PACKAGES),$(patsubst debian/%.symbols.in,%,$(wildcard debian/*.symbols.in)))
 
 ifneq (,$(strip $(SYMBOLSHELPER_PACKAGES)))

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list