[SCM] ktexteditor packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-g964e294

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/ktexteditor.git;a=commitdiff;h=2f75b6a

The following commit has been merged in the kubuntu_wily_archive branch:
commit 2f75b6aaa142aafab4ec3e6dc29d4b1b36a06ae3
Merge: 8602c09056c148d8704cb12eb4bcb2bd2f3a096e b52b176f7c0b4dbc634deec219955aa5aa2dba05
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:28:22 2015 +0200

    Merge commit 'b52b176f7c0b4dbc634deec219955aa5aa2dba05'
    
    Conflicts:
    	debian/control

 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --cc debian/changelog
index 4ac999f,86de60e..d932aa1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +ktexteditor (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:24:19 +0200
 +
+ ktexteditor (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:18:59 +0200
+ 
 +ktexteditor (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * New patch: katesyntaxtest_check_basename
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:48 +0100
 +
+ ktexteditor (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:45:26 +0100
+ 
 +ktexteditor (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:45 +0100
 +
  ktexteditor (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
ktexteditor packaging