[SCM] konsole packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-23-g2ccd817

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit e4fd058c14fc302d88a73f77686638792dca4b9d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Dec 4 18:22:14 2014 +0100

    replace/conflict konsole5
---
 debian/control         | 8 +++++++-
 debian/konsole.install | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 8e73073..9c02bb3 100644
--- a/debian/control
+++ b/debian/control
@@ -40,8 +40,12 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/konsole.git
 
 Package: konsole
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, konsole-kpart (= ${binary:Version})
+Depends: konsole-kpart (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Provides: x-terminal-emulator
+Conflits: konsole5
+Replaces: konsole5
 Description: X terminal emulator
  Konsole is a terminal emulator built on the KDE Platform. It can contain
  multiple terminal sessions inside one window using detachable tabs.
@@ -52,6 +56,8 @@ Description: X terminal emulator
 Package: konsole-kpart
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflits: konsole5
+Replaces: konsole5
 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.install b/debian/konsole.install
index d5f17f9..fdb3d90 100644
--- a/debian/konsole.install
+++ b/debian/konsole.install
@@ -1,4 +1,4 @@
-usr/share/
-usr/lib/*/libkdeinit5_konsole.so
-usr/bin/konsoleprofile
 usr/bin/konsole
+usr/bin/konsoleprofile
+usr/lib/*/libkdeinit5_konsole.so
+usr/share/

-- 
konsole packaging