[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-56-gf356991

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7d92e736a53651045ec3530c34fa7d038af2486d
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Mar 11 17:48:07 2014 +0100

    New patch: install_images_in_datadir
---
 debian/changelog                         |  1 +
 debian/patches/install_images_in_datadir | 12 ++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  7 ++++++-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 501e2b9..7ec0a15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ calligra (1:2.8.0-1~1) UNRELEASED; urgency=medium
   * Reenable krita-sketch and krita-gemini.
   * New patch: calligra_imports_search_path
   * New patch: set_kritasketch_lib_soversion
+  * New patch: install_images_in_datadir
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 08 Mar 2014 15:57:40 +0100
 
diff --git a/debian/patches/install_images_in_datadir b/debian/patches/install_images_in_datadir
new file mode 100644
index 0000000..15c550c
--- /dev/null
+++ b/debian/patches/install_images_in_datadir
@@ -0,0 +1,12 @@
+Index: calligra/krita/sketch/CMakeLists.txt
+===================================================================
+--- calligra.orig/krita/sketch/CMakeLists.txt	2014-03-11 17:04:19.705862942 +0100
++++ calligra/krita/sketch/CMakeLists.txt	2014-03-11 17:30:35.159978130 +0100
+@@ -177,6 +177,6 @@
+                   qml/WelcomePage.qml
+                                     DESTINATION ${CMAKE_INSTALL_LIBDIR}/calligra/imports/org/krita/sketch)
+ install(DIRECTORY qml/components    DESTINATION ${CMAKE_INSTALL_LIBDIR}/calligra/imports/org/krita/sketch PATTERN "*~" EXCLUDE)
+-install(DIRECTORY qml/images        DESTINATION ${CMAKE_INSTALL_LIBDIR}/calligra/imports/org/krita/sketch PATTERN "*~" EXCLUDE)
++install(DIRECTORY qml/images        DESTINATION ${DATA_INSTALL_DIR}/kritasketch PATTERN "*~" EXCLUDE)
+ install(DIRECTORY qml/panels        DESTINATION ${CMAKE_INSTALL_LIBDIR}/calligra/imports/org/krita/sketch PATTERN "*~" EXCLUDE)
+ install(DIRECTORY fonts             DESTINATION ${DATA_INSTALL_DIR}/kritasketch)
diff --git a/debian/patches/series b/debian/patches/series
index d9aaac1..56d606d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 set_kritasketch_lib_soversion
+install_images_in_datadir
 add_keywords_to_desktop_files.patch
 eigen3.patch
 eigen3_in_tests
diff --git a/debian/rules b/debian/rules
index e935c4c..6809337 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ lib_pkgs := calligra-libs
 #export DH_VERBOSE=1
 
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --parallel --with kde --with sodeps
@@ -32,6 +33,11 @@ endif
 override_dh_install:
 	dh_install --list-missing
 
+override_dh_link:
+	dh_link -pkrita-sketch /usr/share/kde4/apps/kritasketch/images \
+	    usr/lib/$(DEB_HOST_MULTIARCH)/calligra/imports/org/krita/sketch/images
+	dh_link --remaining-packages
+
 override_dh_strip:
 	dh_strip --dbg-package=calligra-dbg
 
@@ -40,4 +46,3 @@ override_dh_shlibdeps:
 	dh_shlibdeps --remaining-packages
 
 .PHONY: override_dh_auto_test
-

-- 
Calligra suite packaging