[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-74-g5fbd59b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=76d669c

The following commit has been merged in the master branch:
commit 76d669ce39d1215773ed74b565a421cd64264e69
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 17 10:58:00 2016 +0200

    move non-conflicting, non-application assets from konsole to kpart package
    
    this includes:
    - kpart service file (kservices5)
    - kpart terminal emulator type (kservicetypes5)
    - keyboard layouts & colors (konsole)
    - notification profiles (knotifications5)
    - ui definitions (kxmlgui5)
    
    out of those only one of the 3 ui definitions isn't used by the kpart, so
    this for the most part only moves all relevant bits into the kpart package.
    
    generally speaking we should move forward packaging all semi-versioned bits
    into the kpart package to make sure the kpart is actually functional.
    
    NB: share/konsole/ is not conflicting because in kde4 we had
        share/kde4/konsole, this is however something to watch out for come
        qt6. we should push for proper compatibility versioning of there
        that folder then.
---
 debian/control               | 2 ++
 debian/konsole-kpart.install | 5 +++++
 debian/konsole.install       | 5 -----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index cabefb9..910c641 100644
--- a/debian/control
+++ b/debian/control
@@ -54,6 +54,8 @@ Description: X terminal emulator
 Package: konsole-kpart
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: konsole (<< 16.04.0-0neon+16.04+build4~)
+Replaces: konsole (<< 16.04.0-0neon+16.04+build4~)
 Description: Konsole plugin for Qt applications
  Konsole is a terminal emulator built on the KDE Platform. It can contain
  multiple terminal sessions inside one window using detachable tabs.
diff --git a/debian/konsole-kpart.install b/debian/konsole-kpart.install
index 8f788cc..44ea29b 100644
--- a/debian/konsole-kpart.install
+++ b/debian/konsole-kpart.install
@@ -1,2 +1,7 @@
 usr/lib/*/libkonsoleprivate.so.*
 usr/lib/*/qt5/plugins/konsolepart.so
+usr/share/knotifications5/
+usr/share/konsole/
+usr/share/kservices5/konsolepart.desktop
+usr/share/kservicetypes5/terminalemulator.desktop
+usr/share/kxmlgui5/konsole/
diff --git a/debian/konsole.install b/debian/konsole.install
index 8a22b68..ee852be 100644
--- a/debian/konsole.install
+++ b/debian/konsole.install
@@ -4,10 +4,5 @@ usr/lib/*/libkdeinit5_konsole.so
 usr/share/appdata/org.kde.konsole.appdata.xml
 usr/share/applications/org.kde.konsole.desktop
 usr/share/doc/HTML/*/konsole/
-usr/share/knotifications5/konsole.notifyrc
-usr/share/konsole/
 usr/share/kservices5/ServiceMenus/konsolehere.desktop
 usr/share/kservices5/ServiceMenus/konsolerun.desktop
-usr/share/kservices5/konsolepart.desktop
-usr/share/kservicetypes5/terminalemulator.desktop
-usr/share/kxmlgui5/konsole/

-- 
konsole packaging