[SCM] plasma-desktop packaging branch, kubuntu_unstable, updated. fd57dd551f492f053ef6c005d7cdb1300b517328

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit fd57dd551f492f053ef6c005d7cdb1300b517328
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Feb 26 10:32:58 2015 +0100

    cleanup new stuff
    
    - lintian override missing manpage
    - make sure we have a miscdepends on the transitional package
    - install dbus interface to -dev package and add conflicts breaks to
      old kcm packages
---
 debian/control                          | 6 +++++-
 debian/plasma-desktop-dev.install       | 1 +
 debian/plasma-desktop.lintian-overrides | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 3d28630..c3169ca 100644
--- a/debian/control
+++ b/debian/control
@@ -59,6 +59,10 @@ Depends: libkfontinst5 (= ${binary:Version}),
          plasma-desktop (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: kde-config-touchpad (<< 4:5.2.50),
+        kde-touchpad (<< 5.1.95~)
+Replaces: kde-config-touchpad (<< 4:5.2.50),
+          kde-touchpad (<< 5.1.95~)
 Description: Tools and widgets for the desktop
  Plasma Desktop offers a beautiful looking desktop
  that takes complete advantage of modern computing technology.
@@ -179,7 +183,7 @@ Description: Tools and widgets for the desktop data files
 
 Package: kde-touchpad
 Architecture: any
-Depends: plasma-desktop
+Depends: plasma-desktop (>= ${source:Version}), ${misc:Depends}
 Section: oldlibs
 Priority: extra
 Description: transitional package
diff --git a/debian/plasma-desktop-dev.install b/debian/plasma-desktop-dev.install
index 67391a9..943c0b8 100644
--- a/debian/plasma-desktop-dev.install
+++ b/debian/plasma-desktop-dev.install
@@ -1,2 +1,3 @@
 usr/lib/*/libkfontinst.so
 usr/lib/*/libkfontinstui.so
+usr/share/dbus-1/interfaces/*
diff --git a/debian/plasma-desktop.lintian-overrides b/debian/plasma-desktop.lintian-overrides
index 1f7967a..d0249c3 100644
--- a/debian/plasma-desktop.lintian-overrides
+++ b/debian/plasma-desktop.lintian-overrides
@@ -2,6 +2,7 @@ plasma-desktop: desktop-command-not-in-package usr/share/applications/knetattach
 plasma-desktop: package-name-doesnt-match-sonames libkdeinit5-kaccess
 plasma-desktop: binary-without-manpage usr/bin/kaccess
 plasma-desktop: binary-without-manpage usr/bin/kapplymousetheme
+plasma-desktop: binary-without-manpage usr/bin/kcm-touchpad-list-devices
 plasma-desktop: binary-without-manpage usr/bin/kfontinst
 plasma-desktop: binary-without-manpage usr/bin/kfontview
 plasma-desktop: binary-without-manpage usr/bin/knetattach

-- 
plasma-desktop packaging