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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 2eb5f1dc5a190c5e336d4739d0c6d79f53b866af
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Feb 17 20:22:40 2010 +0200

    Move RPATH "workaround" code for <= KDE 4.3.x to variables.mk.
    
    Moving from makefiles/1/cdbs/kde.mk to makefiles/1/variables.mk allows
    debian-qt-kde.mk to use that workaround as well.
---
 debian/changelog         |    2 ++
 makefiles/1/cdbs/kde.mk  |    7 -------
 makefiles/1/variables.mk |    7 +++++++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd33e7b..762b6a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ pkg-kde-tools (0.6.5~pre2) UNRELEASED; urgency=low
   * pkgkde-debs2symbols: remove 0 size patch files.
   * `pkgkde-symbolshelper batchpatch`: if no packages explicitly specified,
     select only those for which patches exist.
+  * Move RPATH "workaround" code for <= KDE 4.3.x from makefiles/1/cdbs/kde.mk
+    to makefiles/1/variables.mk hence debian-qt-kde.mk will also use it.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 16 Feb 2010 11:51:57 +0200
 
diff --git a/makefiles/1/cdbs/kde.mk b/makefiles/1/cdbs/kde.mk
index eb98a2a..074838e 100644
--- a/makefiles/1/cdbs/kde.mk
+++ b/makefiles/1/cdbs/kde.mk
@@ -9,12 +9,5 @@ DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 DEB_DH_MAKESHLIBS_ARGS += -Xusr/lib/kde4/
 
-# Skip RPATH if kdelibs5-dev is older than 4:4.4.0
-DEB_KDELIBS5_DEV_VER := $(shell dpkg-query -f='$${Version}\n' -W kdelibs5-dev 2>/dev/null)
-DEB_KDELIBS5_DEV_VER_OLD := $(shell dpkg --compare-versions $(DEB_KDELIBS5_DEV_VER) lt 4:4.4.0 2>/dev/null && echo yes)
-ifeq (yes,$(DEB_KDELIBS5_DEV_VER_OLD))
-    DEB_CMAKE_KDE4_FLAGS += -DCMAKE_SKIP_RPATH:BOOL=ON
-endif
-
 $(patsubst %,binary-post-install/%,$(DEB_ARCH_PACKAGES)) :: binary-post-install/%:
 	dh_movelibkdeinit -p$(cdbs_curpkg) $(DEB_DH_MOVELIBKDEINIT_ARGS)
diff --git a/makefiles/1/variables.mk b/makefiles/1/variables.mk
index a86bb29..4b1dcbb 100644
--- a/makefiles/1/variables.mk
+++ b/makefiles/1/variables.mk
@@ -8,6 +8,13 @@ ifdef DEB_CONFIG_INSTALL_DIR
                             -DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR)
 endif
 
+# Skip RPATH if kdelibs5-dev is older than 4:4.4.0
+DEB_KDELIBS5_DEV_VER := $(shell dpkg-query -f='$${Version}\n' -W kdelibs5-dev 2>/dev/null)
+DEB_KDELIBS5_DEV_VER_OLD := $(shell dpkg --compare-versions $(DEB_KDELIBS5_DEV_VER) lt 4:4.4.0 2>/dev/null && echo yes)
+ifeq (yes,$(DEB_KDELIBS5_DEV_VER_OLD))
+    DEB_CMAKE_KDE4_FLAGS += -DCMAKE_SKIP_RPATH:BOOL=ON
+endif
+
 # Set the DEB_KDE_LINK_WITH_AS_NEEDED to yes to enable linking
 # with --as-needed (off by default)
 DEB_KDE_LINK_WITH_AS_NEEDED ?= no

-- 
Debian Qt/KDE packaging tools