[SCM] konsole packaging branch, kubuntu_unstable_utopic, updated. debian/4.14.2-1-32-g0a70575

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable_utopic branch:
commit 0a70575e9f9d747794e79c23272017b662ae2781
Merge: 3f638f21a79a4b976c3991c0b8f02d61a5a7dd18 2ccd817ca30fd7848fe2e42116fdb3fe2d13bc22
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Dec 5 09:31:48 2014 +0100

    Merge branch 'kubuntu_unstable' into kubuntu_unstable_utopic
    
    Conflicts:
    	debian/control

 debian/control          | 10 +++++++---
 debian/konsole.install  |  6 +++---
 debian/konsole5.install |  6 +++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --cc debian/control
index 612867b,ee1f2b0..0013e42
--- a/debian/control
+++ b/debian/control
@@@ -38,13 -38,14 +38,15 @@@ 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,
-          konsole-kpart (= ${binary:Version}),
+ Depends: konsole-kpart (= ${binary:Version}),
           ${misc:Depends},
--         ${shlibs:Depends}
++         ${shlibs:Depends},
++         konsole
  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.
@@@ -55,6 -56,8 +57,8 @@@
  Package: konsole-kpart
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
 -Conflicts: konsole5
 -Replaces: konsole5
++#Conflicts: 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 --cc debian/konsole5.install
index 5475077,fdb3d90..aa844b3
--- a/debian/konsole5.install
+++ b/debian/konsole5.install
@@@ -1,4 -1,4 +1,4 @@@
- usr/share/
- usr/lib/*/libkdeinit5_konsole.so
- usr/bin/konsoleprofile5
 -usr/bin/konsole
 -usr/bin/konsoleprofile
 +usr/bin/konsole5
++usr/bin/konsoleprofile5
+ usr/lib/*/libkdeinit5_konsole.so
+ usr/share/

-- 
konsole packaging