[SCM] KDE Base Workspace module packaging branch, kde4.9, updated. debian/4.8.4-4-16-g36acdd8

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=36acdd8

The following commit has been merged in the kde4.9 branch:
commit 36acdd8d2c92ee7cabc095d7462374f624d79afe
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Nov 23 16:38:37 2012 +0100

    Move a couple of dataengines files to its proper place.
---
 debian/changelog                            |    4 ++++
 debian/control                              |    2 ++
 debian/kde-workspace-bin.install            |    2 --
 debian/plasma-dataengines-workspace.install |    2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71f6c43..b540b7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,10 @@ kde-workspace (4:4.9.3-0r0) UNRELEASED; urgency=low
     - extend place_global_config_in_etc.diff.
     - refresh other patches to make them apply without any offset.
   * Update installed files.
+  * Move these files from kde-workspace-bin to plasma-dataengines-workspace:
+    - usr/lib/kde4/plasma_engine_activities.so
+    - usr/lib/kde4/plasma_engine_share.so
+    (*.install files were updated and added the necessary Breaks/Replaces)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 15 Aug 2012 11:34:25 +0200
 
diff --git a/debian/control b/debian/control
index f2f558b..dd612d5 100644
--- a/debian/control
+++ b/debian/control
@@ -177,6 +177,8 @@ Package: plasma-dataengines-workspace
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: ksysguardd (= ${binary:Version})
+Breaks: kde-workspace-bin (<< 4:4.9.3)
+Replaces: kde-workspace-bin (<< 4:4.9.3)
 Description: KDE Plasma data engines
  This package contains standard Plasma data engines shipped in KDE Plasma
  workspace. These engines are needed by the standard KDE base
diff --git a/debian/kde-workspace-bin.install b/debian/kde-workspace-bin.install
index f92fbbf..74e423d 100644
--- a/debian/kde-workspace-bin.install
+++ b/debian/kde-workspace-bin.install
@@ -98,8 +98,6 @@ usr/lib/kde4/plasma_containmentactions_paste.so
 usr/lib/kde4/plasma_containmentactions_switchactivity.so
 usr/lib/kde4/plasma_containmentactions_switchdesktop.so
 usr/lib/kde4/plasma_containmentactions_switchwindow.so
-usr/lib/kde4/plasma_engine_activities.so
-usr/lib/kde4/plasma_engine_share.so
 usr/lib/kde4/plasma_packagestructure_share.so
 usr/lib/kde4/plasma_toolbox_desktoptoolbox.so
 usr/lib/kde4/plasma_toolbox_nettoolbox.so
diff --git a/debian/plasma-dataengines-workspace.install b/debian/plasma-dataengines-workspace.install
index 97833d2..9486121 100644
--- a/debian/plasma-dataengines-workspace.install
+++ b/debian/plasma-dataengines-workspace.install
@@ -5,6 +5,7 @@ usr/lib/kde4/ion_noaa.so
 usr/lib/kde4/ion_wettercom.so
 usr/lib/kde4/plasma-geolocation-gps.so
 usr/lib/kde4/plasma-geolocation-ip.so
+usr/lib/kde4/plasma_engine_activities.so
 usr/lib/kde4/plasma_engine_akonadi.so
 usr/lib/kde4/plasma_engine_applicationjobs.so
 usr/lib/kde4/plasma_engine_apps.so
@@ -26,6 +27,7 @@ usr/lib/kde4/plasma_engine_nowplaying.so
 usr/lib/kde4/plasma_engine_places.so
 usr/lib/kde4/plasma_engine_powermanagement.so
 usr/lib/kde4/plasma_engine_rss.so
+usr/lib/kde4/plasma_engine_share.so
 usr/lib/kde4/plasma_engine_soliddevice.so
 usr/lib/kde4/plasma_engine_statusnotifieritem.so
 usr/lib/kde4/plasma_engine_systemmonitor.so

-- 
KDE Base Workspace module packaging