[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.9-1-11-gff39374

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit cb9e20766e99364bb6fc96089f45f6cd740e8dc8
Author: Philip Muskovac <yofel at gmx.net>
Date:   Mon Jun 9 13:20:27 2014 +0200

    add subtle.desktop to kdm.install
    drop removed solid-hardware docs from kde-workspace-data.install
    
    Conflicts:
    	debian/changelog
---
 debian/changelog                  | 4 ++++
 debian/kde-workspace-data.install | 1 -
 debian/kdm.install                | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bde7c0b..64c3b66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ kde-workspace (4:4.11.11-1) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Switch the libpng12-dev build dependency to libpng-dev.
 
+  [ Philip Muškovac ]
+  * add subtle.desktop to kdm.install
+  * drop removed solid-hardware docs from kde-workspace-data.install
+
   [ Maximiliano Curia ]
   * New upstream release.
   * Remove upstream patch: 0001-Trigger-the-Present-Windows-effect-when-
diff --git a/debian/kde-workspace-data.install b/debian/kde-workspace-data.install
index 513badd..6962821 100644
--- a/debian/kde-workspace-data.install
+++ b/debian/kde-workspace-data.install
@@ -23,7 +23,6 @@ usr/share/doc/kde/HTML/*/kcontrol/paths/
 usr/share/doc/kde/HTML/*/kcontrol/powerdevil/
 usr/share/doc/kde/HTML/*/kcontrol/screensaver/
 usr/share/doc/kde/HTML/*/kcontrol/solid-actions/
-usr/share/doc/kde/HTML/*/kcontrol/solid-hardware/
 usr/share/doc/kde/HTML/*/kcontrol/splashscreen/
 usr/share/doc/kde/HTML/*/kcontrol/workspaceoptions/
 usr/share/doc/kde/HTML/*/kfontview/
diff --git a/debian/kdm.install b/debian/kdm.install
index d5a7032..e8f37c4 100644
--- a/debian/kdm.install
+++ b/debian/kdm.install
@@ -88,6 +88,7 @@ usr/share/kde4/apps/kdm/sessions/qvwm.desktop
 usr/share/kde4/apps/kdm/sessions/ratpoison.desktop
 usr/share/kde4/apps/kdm/sessions/sapphire.desktop
 usr/share/kde4/apps/kdm/sessions/sawfish.desktop
+usr/share/kde4/apps/kdm/sessions/subtle.desktop
 usr/share/kde4/apps/kdm/sessions/twm.desktop
 usr/share/kde4/apps/kdm/sessions/ude.desktop
 usr/share/kde4/apps/kdm/sessions/vtwm.desktop

-- 
KDE Base Workspace module packaging