[SCM] kate packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-27-g19495e9

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 3dde1d5df7025dfde965a63863b42c582698fa0d
Merge: d8d72b60bb15a35164f95224bab8d9575a8ed7dd 2b704505ea80e78a0bbc4237fab6e628d9f99f03
Author: Philip Muškovac <yofel at gmx.net>
Date:   Mon Jan 18 13:16:46 2016 +0100

    Merge remote-tracking branch 'origin/master' into kubuntu_xenial_archive
    
    Conflicts:
    	debian/kate.install
    	debian/kate5-data.install

 debian/changelog          |  75 +++-
 debian/control            |  38 +-
 debian/copyright          | 963 +++++++++++++++++++++++++++++++---------------
 debian/kate.install       |  22 +-
 debian/kate5-data.install |   4 +-
 debian/rules              |   4 +-
 6 files changed, 741 insertions(+), 365 deletions(-)

diff --cc debian/changelog
index 3626810,76a8f30..e064ac0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,32 +1,55 @@@
 +kate (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
++  [ Clive Johnston ]
 +  * New upstream release
 +
++  [ Philip Muškovac ]
++  * Merge with debian git master
++
 + -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:40:49 +0000
 +
+ kate (4:15.08.3-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Dec 2015 12:38:32 +0100
+ 
+ kate (4:15.08.2-1) unstable; urgency=medium
+ 
+   * Add copyright information about the current license of the linkable
+     code. (Closes: #799431)
+   * New upstream release (15.08.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 16 Oct 2015 08:06:43 +0200
+ 
 +kate (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 11:58:32 +0100
 +
+ kate (4:15.08.1-1) unstable; urgency=medium
+ 
+   * Drop fake katepart dependency, it wasnt really needed. (Closes:
+     799294) Thanks to Ralf Jung
+   * New upstream release (15.08.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 02:44:53 +0200
+ 
 +kate (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 16:16:43 +0100
 +
+ kate (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.0).
+   * Add fake dependency for the kde4 katepapart package.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 08 Sep 2015 17:18:25 +0200
+ 
  kate (4:15.08.0-0ubuntu1) wily; urgency=medium
  
    * new upstream release

-- 
kate packaging