[SCM] Calligra suite packaging branch, master, updated. debian/2.9.11+dfsg-3-2-g062ad2f

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/calligra/calligra.git;a=commitdiff;h=062ad2f

The following commit has been merged in the master branch:
commit 062ad2fcb2ac171f65c72135a50eca4290aad1a6
Author: Pino Toscano <pino at debian.org>
Date:   Mon Oct 10 22:10:36 2016 +0200

    calligra-gemini: create symlink only when package is built
    
    fix arch-indep builds
---
 debian/changelog | 3 +++
 debian/rules     | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d60356b..b9a331e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 calligra (1:2.9.11+dfsg-4) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Create the symlink in calligra-gemini only when the package is built;
+    fix arch-indep builds.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 10 Oct 2016 22:08:14 +0200
 
diff --git a/debian/rules b/debian/rules
index 8aaaf55..a536f6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,9 @@ override_dh_link:
 	# the calligra-gemini components are installed in a multi-arch library
 	# directory, but kdelibs 4.x does not support that -- instead,
 	# create a simple symlink to avoid shuffling things too much
-	ln -s $(DEB_HOST_MULTIARCH)/calligra $(CURDIR)/debian/calligra-gemini/usr/lib/calligra
+	if [ -d debian/calligra-gemini ]; then \
+	    ln -s $(DEB_HOST_MULTIARCH)/calligra $(CURDIR)/debian/calligra-gemini/usr/lib/calligra; \
+	fi
 	dh_link
 
 override_dh_strip:

-- 
Calligra suite packaging