[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 8f7d8aa386115ac3a6ed3fa5ee0dc16260284eb1
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Feb 13 15:15:15 2010 +0200

    Omit usr/lib/kde4/ from dh_makeshlibs by default.
    
    CDBS kde.mk, debian-qt-kde.mk and dh kde addon.
---
 debhelper/Debian/Debhelper/Sequence/kde.pm |    3 +++
 debian/changelog                           |    2 ++
 makefiles/1/cdbs/kde.mk                    |    2 ++
 qt-kde-team/1/debian-qt-kde.mk             |    2 ++
 4 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/debhelper/Debian/Debhelper/Sequence/kde.pm b/debhelper/Debian/Debhelper/Sequence/kde.pm
index 445b6a9..1275288 100644
--- a/debhelper/Debian/Debhelper/Sequence/kde.pm
+++ b/debhelper/Debian/Debhelper/Sequence/kde.pm
@@ -32,4 +32,7 @@ add_command_options("dh_auto_test", "--buildsystem=kde");
 add_command_options("dh_auto_install", "--buildsystem=kde");
 add_command_options("dh_auto_clean", "--buildsystem=kde");
 
+# Omit usr/lib/kde4 from dh_makeshlibs by default
+add_command_options("dh_makeshlibs", "-Xusr/lib/kde4/");
+
 insert_after("dh_install", "dh_movelibkdeinit");
diff --git a/debian/changelog b/debian/changelog
index b58d65e..9e8a290 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ pkg-kde-tools (0.6.2~pre4) UNRELEASED; urgency=low
     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.
+  * Omit usr/lib/kde4/ from dh_makeshlibs by default (debian-qt-kde.mk, kde.mk,
+    dh kde addon).
 
  -- Modestas Vainius <modax at debian.org>  Sat, 13 Feb 2010 02:29:05 +0200
 
diff --git a/makefiles/1/cdbs/kde.mk b/makefiles/1/cdbs/kde.mk
index ce7a399..eb98a2a 100644
--- a/makefiles/1/cdbs/kde.mk
+++ b/makefiles/1/cdbs/kde.mk
@@ -7,6 +7,8 @@ DEB_CMAKE_EXTRA_FLAGS += $(DEB_CMAKE_KDE4_FLAGS) $(DEB_CMAKE_CUSTOM_FLAGS)
 
 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)
diff --git a/qt-kde-team/1/debian-qt-kde.mk b/qt-kde-team/1/debian-qt-kde.mk
index 10c94d2..2e40b98 100644
--- a/qt-kde-team/1/debian-qt-kde.mk
+++ b/qt-kde-team/1/debian-qt-kde.mk
@@ -38,6 +38,8 @@ DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 #DEB_MAKE_ENVVARS += XDG_CONFIG_DIRS=/etc/xdg XDG_DATA_DIRS=/usr/share
 #DEB_STRIP_EXCLUDE = so
 
+DEB_DH_MAKESHLIBS_ARGS += -Xusr/lib/kde4/
+
 common-build-arch:: debian/stamp-man-pages
 debian/stamp-man-pages:
 	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi

-- 
Debian Qt/KDE packaging tools