[SCM] kate packaging branch, master, updated. debian/14.12.3-1-38-gbec3ff2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0914758c956053ed9cbc01a795953a775fc38fa0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 2 13:54:51 2015 +0200

    Fix changelog after merge.
---
 debian/changelog | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bcc06e7..072b17f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,25 +16,18 @@ kate (4:15.04.2-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
   * Fix merge conflict (changelog version discrepancy)
-  * manual merge. 
-  * manual merge backports. 
+  * manual merge.
+  * manual merge backports.
   * Remove upstream_find-IconThemes.diff from series file.
-    The patch does not exist in directory. 
+    The patch does not exist in directory.
   * and remove upstream_Register_with_dbus_to_wake_up_KRun.patch
-    it has already been applied to this backport. 
+    it has already been applied to this backport.
 
   [ Jonathan Riddell ]
   * New upstream release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 18:37:40 +0200
 
-kate (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release
-  * Vivid backport
-
- -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 08:19:24 -0700
-
 kate (4:14.12.3-1) experimental; urgency=medium
 
   * New upstream release (14.12.3).

-- 
kate packaging