[SCM] konsole packaging branch, master, updated. debian/14.12.3-1-17-g3653cab

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 1410e9d9b148de8170200ba7342af945715b1acc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jul 23 22:19:42 2015 -0300

    Remove references to packages never shipped in Debian.
---
 debian/changelog | 1 +
 debian/control   | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b422e8f..559e158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ konsole (4:15.04.3-1~) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Remove Eshat cakar from Uploaders at his own request. Thanks Eshat
     for your work!
+  * Remove references to packages never shipped in Debian.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:30:14 +0200
 
diff --git a/debian/control b/debian/control
index e064ec1..db6748f 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Build-Depends: cmake (>= 2.8.12),
                libkf5windowsystem-dev (>= 5.6.0~),
                libkf5xmlgui-dev (>= 5.6.0~),
                libx11-dev,
-               pkg-kde-tools (>= 0.15.15ubuntu1~),
+               pkg-kde-tools (>= 0.15.15~),
                qtbase5-dev (>= 5.4),
                qtscript5-dev (>= 5.4)
 Standards-Version: 3.9.6
@@ -44,8 +44,6 @@ Depends: konsole-kpart (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: x-terminal-emulator
-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.
@@ -56,8 +54,6 @@ Description: X terminal emulator
 Package: konsole-kpart
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-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.

-- 
konsole packaging