[SCM] plasma-workspace packaging branch, kubuntu_vivid_archive, updated. d28a429170cac50ee2e637cce359ccadb9ca76dd

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit d28a429170cac50ee2e637cce359ccadb9ca76dd
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Jan 7 08:54:01 2015 +0100

    kglobalacceld5 moved to frameworks
    
    - plasma-workspace (previous thing containing it) depends on
      libkf5globalaccel-bin to pull in the demon
    - update install files to not install globalaccel
    - update lintian-overrides to not override no longer applicable problems
---
 debian/control                            | 1 +
 debian/plasma-workspace.install           | 2 --
 debian/plasma-workspace.lintian-overrides | 5 +----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 6cc3f2f..bb7eba9 100644
--- a/debian/control
+++ b/debian/control
@@ -148,6 +148,7 @@ Depends: dbus-x11,
          kinit,
          kio-extras,
          libkf5service-bin,
+         libkf5globalaccel-bin,
          milou,
          plasma-framework,
          qdbus-qt5,
diff --git a/debian/plasma-workspace.install b/debian/plasma-workspace.install
index 266131b..db4d4a1 100644
--- a/debian/plasma-workspace.install
+++ b/debian/plasma-workspace.install
@@ -3,7 +3,6 @@ usr/bin/
 usr/lib/*/libexec
 usr/lib/*/libkdeinit5_kcminit.so
 usr/lib/*/libkdeinit5_kcminit_startup.so
-usr/lib/*/libkdeinit5_kglobalaccel5.so
 usr/lib/*/libkdeinit5_klipper.so
 usr/lib/*/libkdeinit5_ksmserver.so
 usr/lib/*/libkdeinit5_kuiserver5.so
@@ -11,7 +10,6 @@ usr/lib/*/qt5
 usr/share/applications
 usr/share/config.kcfg
 usr/share/dbus-1/services/kf5_org.kde.kuiserver.service
-usr/share/dbus-1/services/org.kde.kglobalaccel.service
 usr/share/dbus-1/services/org.kde.krunner.service
 usr/share/desktop-directories
 usr/share/desktop-directories
diff --git a/debian/plasma-workspace.lintian-overrides b/debian/plasma-workspace.lintian-overrides
index de8a838..24ea72b 100644
--- a/debian/plasma-workspace.lintian-overrides
+++ b/debian/plasma-workspace.lintian-overrides
@@ -1,9 +1,8 @@
-plasma-workspace: package-name-doesnt-match-sonames libkdeinit5-kcminit libkdeinit5-kcminit-startup libkdeinit5-kglobalaccel5 libkdeinit5-klipper libkdeinit5-ksmserver libkdeinit5-kuiserver5
+plasma-workspace: package-name-doesnt-match-sonames libkdeinit5-kcminit libkdeinit5-kcminit-startup libkdeinit5-klipper libkdeinit5-ksmserver libkdeinit5-kuiserver5
 plasma-workspace: binary-without-manpage usr/bin/kcheckrunning
 plasma-workspace: binary-without-manpage usr/bin/kcminit
 plasma-workspace: binary-without-manpage usr/bin/kcminit_startup
 plasma-workspace: binary-without-manpage usr/bin/kdostartupconfig5
-plasma-workspace: binary-without-manpage usr/bin/kglobalaccel5
 plasma-workspace: binary-without-manpage usr/bin/klipper
 plasma-workspace: binary-without-manpage usr/bin/krunner
 plasma-workspace: binary-without-manpage usr/bin/ksmserver
@@ -15,13 +14,11 @@ plasma-workspace: binary-without-manpage usr/bin/plasmawindowed
 plasma-workspace: binary-without-manpage usr/bin/startkde
 plasma-workspace: binary-without-manpage usr/bin/systemmonitor
 plasma-workspace: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_klipper.so usr/lib/*/libkdeinit5_klipper.so
-plasma-workspace: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kglobalaccel5.so usr/lib/*/libkdeinit5_kglobalaccel5.so
 plasma-workspace: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kcminit_startup.so usr/lib/*/libkdeinit5_kcminit_startup.so
 plasma-workspace: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kcminit.so usr/lib/*/libkdeinit5_kcminit.so
 plasma-workspace: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kuiserver5.so usr/lib/*/libkdeinit5_kuiserver5.so
 plasma-workspace: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_ksmserver.so usr/lib/*/libkdeinit5_ksmserver.so
 plasma-workspace: shlib-without-versioned-soname usr/lib/*/libkdeinit5_klipper.so libkdeinit5_klipper.so
-plasma-workspace: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kglobalaccel5.so libkdeinit5_kglobalaccel5.so
 plasma-workspace: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kcminit_startup.so libkdeinit5_kcminit_startup.so
 plasma-workspace: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kcminit.so libkdeinit5_kcminit.so
 plasma-workspace: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kuiserver5.so libkdeinit5_kuiserver5.so

-- 
plasma-workspace packaging