[SCM] konsole packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-26-g21367f3

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit d1caa6ec603dd0840def5da3bf0b396150d7c481
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 5 16:34:56 2014 +0100

    update to 14.11.97
---
 debian/.gitattributes       | 1 -
 debian/changelog            | 7 +++++--
 debian/control              | 4 ----
 debian/source/local-options | 1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 888ef50..df66e81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-konsole (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+konsole (4:14.11.97-0ubuntu1~ubuntu15.04~ppa3) vivid; urgency=medium
 
   [ Jonathan Riddell ]
   * New upstream RC release
@@ -10,7 +10,10 @@ konsole (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
   * Complete build depends list
   * Use wildcard in install file, we only have one binary package
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 28 Nov 2014 19:23:42 +0100
+  [ Jonathan Riddell ]
+  * PPA build
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Dec 2014 18:24:46 +0100
 
 konsole (4:4.14.2-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 1432092..ee1f2b0 100644
--- a/debian/control
+++ b/debian/control
@@ -46,10 +46,6 @@ Depends: konsole-kpart (= ${binary:Version}),
 Provides: x-terminal-emulator
 Conflicts: konsole5
 Replaces: konsole5
-Breaks: kdevplatform (<< 1.7.0-2ubuntu2),
-        kile (<< 4:2.1.3-2ubuntu3),
-        krusader (<< 1:2.4.0~beta3-2ubuntu1),
-        yakuake (<< 2.9.9-1ubuntu1)
 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.
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
konsole packaging