[SCM] kdeplasma-addons packaging branch, master, updated. debian/4%5.12.0-2-5-gb6476e5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kdeplasma-addons.git;a=commitdiff;h=44b8e4f

The following commit has been merged in the master branch:
commit 44b8e4fe12b45dc03ab55842c07606f763ddab6e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Feb 14 21:26:59 2018 +0100

    Install the dict applet only if we could build it
---
 debian/plasma-widgets-addons.install |  5 -----
 debian/rules                         | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/plasma-widgets-addons.install b/debian/plasma-widgets-addons.install
index 86bb015..142d51b 100644
--- a/debian/plasma-widgets-addons.install
+++ b/debian/plasma-widgets-addons.install
@@ -5,7 +5,6 @@ usr/lib/*/qt5/plugins/plasma/applets/org.kde.plasma.private.grouping.so
 usr/lib/*/qt5/plugins/plasma/applets/plasma_applet_comic.so
 usr/lib/*/qt5/plugins/plasma/applets/plasma_applet_weather.so
 usr/lib/*/qt5/qml/org/kde/plasma/private/colorpicker/
-usr/lib/*/qt5/qml/org/kde/plasma/private/dict/
 usr/lib/*/qt5/qml/org/kde/plasma/private/diskquota/
 usr/lib/*/qt5/qml/org/kde/plasma/private/fifteenpuzzle/
 usr/lib/*/qt5/qml/org/kde/plasma/private/mediaframe/
@@ -16,7 +15,6 @@ usr/lib/*/qt5/qml/org/kde/plasma/private/quicklaunch/
 usr/lib/*/qt5/qml/org/kde/plasma/private/showdesktop/
 usr/lib/*/qt5/qml/org/kde/plasma/private/timer/
 usr/lib/*/qt5/qml/org/kde/plasma/private/weather/
-usr/share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
 usr/share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
 usr/share/kservices5/plasma-applet-org.kde.plasma.activitypager.desktop
 usr/share/kservices5/plasma-applet-org.kde.plasma.binaryclock.desktop
@@ -41,7 +39,6 @@ usr/share/kservices5/plasma-applet-org.kde.plasma.timer.desktop
 usr/share/kservices5/plasma-applet-org.kde.plasma.userswitcher.desktop
 usr/share/kservices5/plasma-applet-org.kde.plasma.weather.desktop
 usr/share/kservices5/plasma-applet-org.kde.plasma.webbrowser.desktop
-usr/share/kservices5/plasma-applet-org.kde.plasma_applet_dict.desktop
 usr/share/metainfo/org.kde.plasma.activitypager.appdata.xml
 usr/share/metainfo/org.kde.plasma.binaryclock.appdata.xml
 usr/share/metainfo/org.kde.plasma.calculator.appdata.xml
@@ -64,7 +61,6 @@ usr/share/metainfo/org.kde.plasma.timer.appdata.xml
 usr/share/metainfo/org.kde.plasma.userswitcher.appdata.xml
 usr/share/metainfo/org.kde.plasma.weather.appdata.xml
 usr/share/metainfo/org.kde.plasma.webbrowser.appdata.xml
-usr/share/metainfo/org.kde.plasma_applet_dict.appdata.xml
 usr/share/plasma/desktoptheme/default
 usr/share/plasma/plasmoids/org.kde.plasma.activitypager/
 usr/share/plasma/plasmoids/org.kde.plasma.binaryclock/
@@ -89,4 +85,3 @@ usr/share/plasma/plasmoids/org.kde.plasma.timer/
 usr/share/plasma/plasmoids/org.kde.plasma.userswitcher/
 usr/share/plasma/plasmoids/org.kde.plasma.weather/
 usr/share/plasma/plasmoids/org.kde.plasma.webbrowser/
-usr/share/plasma/plasmoids/org.kde.plasma_applet_dict/
diff --git a/debian/rules b/debian/rules
index ea8d186..04d68f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 l10npkgs_firstversion_ok := 4:4.14.0-2
 include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
@@ -12,6 +14,20 @@ override_dh_auto_test:
 	# Disable dh_auto_test at build time
 	:
 
+override_dh_install:
+	dh_install
+	# Try to copy the webengine dependant applet
+	-cp -r debian/tmp/usr/lib/*/qt5/qml/org/kde/plasma/private/dict/ \
+	    debian/plasma-widgets-addons/usr/lib/$${DEB_HOST_MULTIARCH}/qt5/qml/org/kde/plasma/private/
+	-cp -r debian/tmp/usr/share/plasma/plasmoids/org.kde.plasma_applet_dict/ \
+	    debian/plasma-widgets-addons/usr/share/plasma/plasmoids/
+	-cp debian/tmp/usr/share/icons/hicolor/scalable/apps/accessories-dictionary.svgz \
+	    debian/plasma-widgets-addons/usr/share/icons/hicolor/scalable/apps/
+	-cp debian/tmp/usr/share/kservices5/plasma-applet-org.kde.plasma_applet_dict.desktop \
+	    debian/plasma-widgets-addons/usr/share/kservices5/
+	-cp debian/tmp/usr/share/metainfo/org.kde.plasma_applet_dict.appdata.xml \
+	    debian/plasma-widgets-addons/usr/share/metainfo/
+
 override_dh_strip:
 	dh_strip --dbgsym-migration='kdeplasma-addons-dbg (<= 4:5.5.5-1~~)'
 

-- 
kdeplasma-addons packaging