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

[Pino Toscano]

Author: pino
Date: 2017-12-24 17:32:11 +0000 (Sun, 24 Dec 2017)
New Revision: 20940

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

the port to kf5 will include it too


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2017-12-24 17:30:21 UTC (rev 20939)
+++ kde-extras/k3b/trunk/debian/changelog	2017-12-24 17:32:11 UTC (rev 20940)
@@ -2,8 +2,6 @@
 
   [ Pino Toscano ]
   * New upstream release.
-  * Move the Solid actions to the location of the Frameworks version of Solid:
-    this way they are used in a Plasma 5 environment.
   * Remove unused ${shlibs:Depends} substvar from libk3b-dev.
   * Update watch file.
   * Update the build dependencies following the port to Frameworks:

Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install	2017-12-24 17:30:21 UTC (rev 20939)
+++ kde-extras/k3b/trunk/debian/k3b-data.install	2017-12-24 17:32:11 UTC (rev 20940)
@@ -105,6 +105,11 @@
 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
@@ -130,8 +135,3 @@
 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	2017-12-24 17:30:21 UTC (rev 20939)
+++ kde-extras/k3b/trunk/debian/rules	2017-12-24 17:32:11 UTC (rev 20940)
@@ -11,11 +11,6 @@
 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~)'