rev 20654 - kde-extras/k3b/trunk/debian

[Pino Toscano]

Author: pino
Date: 2016-08-20 11:16:56 +0000 (Sat, 20 Aug 2016)
New Revision: 20654

Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/k3b-data.install
   kde-extras/k3b/trunk/debian/rules
Log:
change installation of solid actions


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2016-08-20 10:48:28 UTC (rev 20653)
+++ kde-extras/k3b/trunk/debian/changelog	2016-08-20 11:16:56 UTC (rev 20654)
@@ -1,5 +1,8 @@
 k3b (2.0.3a-3) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Move the Solid actions to the location of the Frameworks version of Solid:
+    this way they are used in a Plasma 5 environment.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 20 Aug 2016 12:48:14 +0200
 

Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install	2016-08-20 10:48:28 UTC (rev 20653)
+++ kde-extras/k3b/trunk/debian/k3b-data.install	2016-08-20 11:16:56 UTC (rev 20654)
@@ -105,11 +105,6 @@
 usr/share/kde4/apps/k3b/pics/quant/welcome_bg.png
 usr/share/kde4/apps/k3b/tips
 usr/share/kde4/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-usr/share/kde4/apps/solid/actions/k3b_audiocd_rip.desktop
-usr/share/kde4/apps/solid/actions/k3b_copy_disc.desktop
-usr/share/kde4/apps/solid/actions/k3b_create_audio_cd_from_blank_medium.desktop
-usr/share/kde4/apps/solid/actions/k3b_create_data_project_from_blank_medium.desktop
-usr/share/kde4/apps/solid/actions/k3b_videodvd_rip.desktop
 usr/share/kde4/services/ServiceMenus/k3b_create_audio_cd.desktop
 usr/share/kde4/services/ServiceMenus/k3b_create_data_project.desktop
 usr/share/kde4/services/ServiceMenus/k3b_create_video_cd.desktop
@@ -135,3 +130,8 @@
 usr/share/kde4/servicetypes/k3bplugin.desktop
 usr/share/mime/packages/x-k3b.xml
 usr/share/polkit-1/actions/org.kde.kcontrol.k3bsetup.policy
+usr/share/solid/actions/k3b_audiocd_rip.desktop
+usr/share/solid/actions/k3b_copy_disc.desktop
+usr/share/solid/actions/k3b_create_audio_cd_from_blank_medium.desktop
+usr/share/solid/actions/k3b_create_data_project_from_blank_medium.desktop
+usr/share/solid/actions/k3b_videodvd_rip.desktop

Modified: kde-extras/k3b/trunk/debian/rules
===================================================================
--- kde-extras/k3b/trunk/debian/rules	2016-08-20 10:48:28 UTC (rev 20653)
+++ kde-extras/k3b/trunk/debian/rules	2016-08-20 11:16:56 UTC (rev 20654)
@@ -11,6 +11,11 @@
 override_dh_auto_configure:
 	dh_auto_configure -- -DK3B_ENABLE_HAL_SUPPORT=OFF
 
+override_dh_auto_install:
+	dh_auto_install
+	# move the Solid actions to a Frameworks Solid location
+	mv debian/tmp/usr/share/kde4/apps/solid debian/tmp/usr/share/
+
 override_dh_strip:
 	dh_strip --dbgsym-migration='k3b-dbg (<< 2.0.3a-2~)'