[SCM] KDE Base Workspace module packaging branch, kde4.8, updated. debian/4.8.3-2-17-gcb42096

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.8 branch:
commit ad7e3d98dded12b92befeba6a4aca592bf5b78c3
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Jun 8 05:22:34 2012 +0200

    Move documentation about windows behaviour.
---
 debian/changelog                  |    3 +++
 debian/control                    |    2 ++
 debian/kde-window-manager.install |    6 ++++++
 debian/kde-workspace-data.install |    6 ------
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 049b931..2d857db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ kde-workspace (4:4.8.4-0r2) UNRELEASED; urgency=low
   * Refresh patches to make them apply without any offset.
   * Confirm symbols files on more architectures with the 4.8.3 build logs.
   * Set plasma-scriptengine-googlegadgets priority to 'optional'. This fixes the
+  * Move various documentation files about windows behaviour from
+    kde-workspace-data to kde-window-manager.
+  * Set plasma-scriptengine-googlegadgets priority to 'extra'. This fixes the
     following lintian warning:
     - package-depends-on-lower-priority-package plasma-scriptengines:optional
       depends on plasma-scriptengine-googlegadgets:extra
diff --git a/debian/control b/debian/control
index 79567eb..e3042d5 100644
--- a/debian/control
+++ b/debian/control
@@ -346,6 +346,8 @@ Package: kde-window-manager
 Section: x11
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Breaks: kde-workspace-data (<< 4:4.8.3-1)
+Replaces: kde-workspace-data (<< 4:4.8.3-1)
 Provides: x-window-manager
 Description: K window manager (KWin)
  This package contains KWin, the KDE window manager, featuring 
diff --git a/debian/kde-window-manager.install b/debian/kde-window-manager.install
index ab64362..3fac116 100644
--- a/debian/kde-window-manager.install
+++ b/debian/kde-window-manager.install
@@ -47,6 +47,12 @@ usr/share/doc/kde/HTML/en/kcontrol/kwinscreenedges/index.docbook
 usr/share/doc/kde/HTML/en/kcontrol/kwintabbox/common
 usr/share/doc/kde/HTML/en/kcontrol/kwintabbox/index.cache.bz2
 usr/share/doc/kde/HTML/en/kcontrol/kwintabbox/index.docbook
+usr/share/doc/kde/HTML/en/kcontrol/windowbehaviour/common
+usr/share/doc/kde/HTML/en/kcontrol/windowbehaviour/index.cache.bz2
+usr/share/doc/kde/HTML/en/kcontrol/windowbehaviour/index.docbook
+usr/share/doc/kde/HTML/en/kcontrol/windowspecific/common
+usr/share/doc/kde/HTML/en/kcontrol/windowspecific/index.cache.bz2
+usr/share/doc/kde/HTML/en/kcontrol/windowspecific/index.docbook
 usr/share/icons/oxygen/128x128/apps/kcmkwm.png
 usr/share/icons/oxygen/16x16/apps/kcmkwm.png
 usr/share/icons/oxygen/16x16/apps/kwin.png
diff --git a/debian/kde-workspace-data.install b/debian/kde-workspace-data.install
index 1b125c7..78fbbe7 100644
--- a/debian/kde-workspace-data.install
+++ b/debian/kde-workspace-data.install
@@ -77,12 +77,6 @@ usr/share/doc/kde/HTML/en/kcontrol/splashscreen/get-new-theme.png
 usr/share/doc/kde/HTML/en/kcontrol/splashscreen/index.cache.bz2
 usr/share/doc/kde/HTML/en/kcontrol/splashscreen/index.docbook
 usr/share/doc/kde/HTML/en/kcontrol/splashscreen/splash-main.png
-usr/share/doc/kde/HTML/en/kcontrol/windowbehaviour/common
-usr/share/doc/kde/HTML/en/kcontrol/windowbehaviour/index.cache.bz2
-usr/share/doc/kde/HTML/en/kcontrol/windowbehaviour/index.docbook
-usr/share/doc/kde/HTML/en/kcontrol/windowspecific/common
-usr/share/doc/kde/HTML/en/kcontrol/windowspecific/index.cache.bz2
-usr/share/doc/kde/HTML/en/kcontrol/windowspecific/index.docbook
 usr/share/doc/kde/HTML/en/kcontrol/workspaceoptions/common
 usr/share/doc/kde/HTML/en/kcontrol/workspaceoptions/index.cache.bz2
 usr/share/doc/kde/HTML/en/kcontrol/workspaceoptions/index.docbook

-- 
KDE Base Workspace module packaging