[SCM] konsole packaging branch, kubuntu_unstable_utopic, updated. debian/4.14.2-1-91-ga5e980e

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable_utopic branch:
commit a5e980e9d76708c0f2169bfc16e52db8e2092779
Merge: 04203c9391a93e054c63a821ed30c7d3c74222e3 e18a8e4336c5cd01a4e1018fcd4fe32af0ce5c4b
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Aug 19 19:36:56 2015 +0100

    merge

 debian/control | 10 ++++------
 debian/watch   |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --cc debian/control
index c807f07,03884bf..dfb81ef
--- a/debian/control
+++ b/debian/control
@@@ -38,15 -38,14 +38,13 @@@ Homepage: http://www.kde.org
  Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/konsole.git/
  Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/konsole.git
  
 -Package: konsole
 +Package: konsole5
  Architecture: any
--Depends: konsole-kpart (= ${binary:Version}),
++Depends: konsole,
++         konsole-kpart (= ${binary:Version}),
           ${misc:Depends},
-          ${shlibs:Depends},
-          konsole
+          ${shlibs:Depends}
  Provides: x-terminal-emulator
- #Conflicts: konsole5
- #Replaces: konsole5
 -Conflicts: 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.

-- 
konsole packaging