[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.04.2-2-5-g69e411b

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=69e411b

The following commit has been merged in the master branch:
commit 69e411b238d03f1fadaf82f6f5493ca22dd1c74e
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 31 20:25:18 2016 +0200

    fix arch-dep Hurd build
    
    dnyamically create kde-runtime.install.hurd from kde-runtime.install,
    removing the samba bits
---
 debian/changelog |  2 ++
 debian/rules     | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 014829c..c9056ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ kde-runtime (4:16.04.3-0r1) UNRELEASED; urgency=medium
       backported
   * Stop shipping the custom /etc/sysctl.d/30-baloo-inotify-limit.conf: this
     is the wrong place for it, and maybe no more needed.
+  * Fix arch-dep Hurd build: dnyamically create kde-runtime.install.hurd from
+    kde-runtime.install, removing the samba bits.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jul 2016 15:37:23 +0200
 
diff --git a/debian/rules b/debian/rules
index 995390f..a409221 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,6 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-# Because of bug #190367 hurd doesn't support samba
-DEB_TARGET_ARCH_OS:=$(shell dpkg-architecture -qDEB_TARGET_ARCH_OS)
-ifeq ($(DEB_TARGET_ARCH_OS), hurd)
-	DH_INSTALL_PARAMS := -Xkio_smb.so -Xsmb-network.desktop -Xsmb.protocol
-endif
-
 override_dh_auto_configure:
 	$(overridden_command) -- -DBUILD_khelpcenter=FALSE
 
@@ -30,5 +24,13 @@ override_dh_fixperms:
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='kde-runtime-dbg (<= 4:15.12.1-1~~)'
 
-override_dh_install:
-	dh_install $(DH_INSTALL_PARAMS)
+override_dh_install: debian/kde-runtime.install.hurd
+	$(overridden_command) --list-missing
+
+override_dh_clean:
+	$(overridden_command)
+	rm -f debian/kde-runtime.install.hurd
+
+# Because of bug #190367 hurd doesn't support samba
+debian/kde-runtime.install.hurd: debian/kde-runtime.install
+	grep -v smb $< > $@

-- 
KDE Base Runtime module packaging