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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 759b0cbb9216440e367c0882511ead7a0041eac9
Author: Pino Toscano <pino at debian.org>
Date:   Mon Oct 10 21:03:35 2016 +0200

    make calligra-gemini start (#840243)
    
    - create a symlink in the non-multi-arch library directory to the
      multi-arch installation place, as the latter option is not handled by
      kdelibs 4.x
    - add the libqtwebkit-qmlwebkitplugin dependency, as the QtWebKit module
      is used
---
 debian/changelog | 6 ++++++
 debian/control   | 1 +
 debian/rules     | 9 +++++++++
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9023904..ca00def 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ calligra (1:2.9.11+dfsg-3) UNRELEASED; urgency=medium
   * Backport upstream commit 843c41decfa85e351349f7a410893ac85c9d60b7 to find
     PostgreSQL 9.6; patch upstream_cmake-find-PostgreSQL-9.6.patch.
     (Closes: #840071)
+  * Make calligra-gemini start: (Closes: #840243)
+    - create a symlink in the non-multi-arch library directory to the
+      multi-arch installation place, as the latter option is not handled by
+      kdelibs 4.x
+    - add the libqtwebkit-qmlwebkitplugin dependency, as the QtWebKit module
+      is used
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Sep 2016 19:07:44 +0200
 
diff --git a/debian/control b/debian/control
index 7865f21..98ca153 100644
--- a/debian/control
+++ b/debian/control
@@ -549,6 +549,7 @@ Package: calligra-gemini
 Architecture: any
 Depends: calligra-libs (= ${binary:Version}),
          calligra-gemini-data (>= ${source:Version}),
+         libqtwebkit-qmlwebkitplugin,
          ${misc:Depends},
          ${shlibs:Depends},
 Homepage: https://www.calligra.org/gemini/
diff --git a/debian/rules b/debian/rules
index 0222530..8aaaf55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ lib_pkgs := calligra-libs
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 export QT_SELECT=4
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --parallel --with kde
 
@@ -30,6 +32,13 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install --list-missing
 
+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
+	dh_link
+
 override_dh_strip:
 	dh_strip --dbgsym-migration='calligra-dbg (<< 1:2.9.11)'
 

-- 
Calligra suite packaging