[SCM] konsole packaging branch, kubuntu_unstable_utopic, updated. debian/4.14.2-1-37-gc22b455

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable_utopic branch:
commit c22b45595670d3039c80b7c40ff1558f4eb3417b
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Dec 9 09:56:20 2014 +0100

    restore conflictery but with version
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 0013e42..c807f07 100644
--- a/debian/control
+++ b/debian/control
@@ -57,8 +57,8 @@ Description: X terminal emulator
 Package: konsole-kpart
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-#Conflicts: konsole5
-#Replaces: konsole5
+Conflicts: konsole5 (<= 4:14.11.97+git20141208.0155+14.10)
+Replaces: konsole5 (<= 4:14.11.97+git20141208.0155+14.10)
 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.

-- 
konsole packaging