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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 88fc3a3bf95ea08dbe5414c9d39d9aa94c394bbd
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Feb 13 15:04:43 2010 +0200

    No longer globally skip RPATH handling with KDE 4.4.0.
    
    No longer globally skip RPATH handling in cmake if kdelibs5-dev is 4:4.4.0 or
    higher. kde4libs build system has been properly fixed in 4:4.4.0-1.
---
 debhelper/Debian/Debhelper/Buildsystem/kde.pm |   12 +++++++++++-
 debian/changelog                              |    2 ++
 kde4_flags                                    |    2 +-
 makefiles/1/cdbs/kde.mk                       |    7 +++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debhelper/Debian/Debhelper/Buildsystem/kde.pm b/debhelper/Debian/Debhelper/Buildsystem/kde.pm
index cdc1afe..79f7229 100644
--- a/debhelper/Debian/Debhelper/Buildsystem/kde.pm
+++ b/debhelper/Debian/Debhelper/Buildsystem/kde.pm
@@ -47,7 +47,17 @@ sub get_kde4_flags {
 
 sub configure {
     my $this=shift;
-    return $this->SUPER::configure($this->get_kde4_flags(), @_);
+    my @flags = $this->get_kde4_flags();
+
+    # Skip RPATH if kdelibs5-dev is older than 4:4.4.0
+    my $kdever = `dpkg-query -f='\${Version}\n' -W kdelibs5-dev 2>/dev/null`;
+    if ($kdever &&
+        system("dpkg", "--compare-versions", $kdever, "lt", "4:4.4.0") == 0)
+    {
+        push @flags, "-DCMAKE_SKIP_RPATH:BOOL=ON";
+    }
+
+    return $this->SUPER::configure(@flags, @_);
 }
 
 1;
diff --git a/debian/changelog b/debian/changelog
index b19ceef..b58d65e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ pkg-kde-tools (0.6.2~pre4) UNRELEASED; urgency=low
     and debian-qt-kde.mk.
   * Pass new LIBKDEINIT_INSTALL_DIR and ENABLE_LIBKDEINIT_RUNPATH options to
     cmake by default (CDBS kde.mk and debhelper kde buildsystem).
+  * No longer globally skip RPATH handling in cmake if kdelibs5-dev is 4:4.4.0
+    or higher. kde4libs build system has been properly fixed in 4:4.4.0-1.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 13 Feb 2010 02:29:05 +0200
 
diff --git a/kde4_flags b/kde4_flags
index 4b13740..3d2f65f 100644
--- a/kde4_flags
+++ b/kde4_flags
@@ -1,7 +1,7 @@
 -DCMAKE_BUILD_TYPE=Debian
 -DKDE4_BUILD_TESTS=false
 -DKDE_DISTRIBUTION_TEXT="Debian packages"
--DCMAKE_SKIP_RPATH=true
+-DCMAKE_SKIP_RPATH:BOOL=OFF
 -DKDE4_USE_ALWAYS_FULL_RPATH=false
 -DCONFIG_INSTALL_DIR=/usr/share/kde4/config
 -DDATA_INSTALL_DIR=/usr/share/kde4/apps
diff --git a/makefiles/1/cdbs/kde.mk b/makefiles/1/cdbs/kde.mk
index 9fe5f70..ce7a399 100644
--- a/makefiles/1/cdbs/kde.mk
+++ b/makefiles/1/cdbs/kde.mk
@@ -7,5 +7,12 @@ DEB_CMAKE_EXTRA_FLAGS += $(DEB_CMAKE_KDE4_FLAGS) $(DEB_CMAKE_CUSTOM_FLAGS)
 
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
+# 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)

-- 
Debian Qt/KDE packaging tools