[SCM] konsole packaging branch, master, updated. debian/4.14.2-1-52-g037b5c4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 037b5c478bc385c4edea6fe88c1e9a0764ff4e27
Merge: 67add855a70aa34c4a7ccc907bf8c985743b50c4 7eeb4073e50ca6646e63f8e99c6efbe5d22005da
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 20:27:48 2015 +0100

    Merge commit '7eeb4073e50ca6646e63f8e99c6efbe5d22005da'

 debian/changelog                           | 18 ++++++++++++++++
 debian/patches/series                      |  1 +
 debian/patches/upstream_control-space.diff | 33 ++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --cc debian/changelog
index 06eeafb,7013559..40ece4c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,21 +1,38 @@@
 +konsole (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 13:20:23 +0100
 +
+ konsole (4:14.12.3-0ubuntu2) vivid; urgency=medium
+ 
+   * Add upstream_control-space.diff to fix emacs use
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Mar 2015 14:30:11 +0100
+ 
+ konsole (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:19:42 -0700
+ 
 +konsole (4:14.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.2).
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +  * Update install files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 13:13:00 +0100
 +
+ konsole (4:14.12.2-0ubuntu2) vivid; urgency=medium
+ 
+   * Add upstream_control-space.diff to fix emacs use
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 02 Mar 2015 13:43:47 +0100
+ 
  konsole (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
konsole packaging