[SCM] libkomparediff2 packaging branch, kubuntu_stable, updated. debian/15.08.3-1-9-gaaaefb4

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit aaaefb47b3518e4e9988cd698ff01bc794afd3e7
Merge: 4a9454a08fee3086328e8faf972e84548318fcd5 cf3ca072239e0a01e86fd396ad52a0b64bd0e763
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Feb 8 20:30:14 2016 +0000

    Merged with Debian and New upstream release

 debian/.gitattributes                              |  1 +
 debian/changelog                                   | 23 ++++++++---
 debian/control                                     |  7 ++--
 debian/copyright                                   | 48 +++++++++++++++++-----
 ...komparediff2-5.acc => libkomparediff2-5.acc.in} |  9 +++-
 debian/tests/acc                                   |  8 ++++
 6 files changed, 74 insertions(+), 22 deletions(-)

diff --cc debian/changelog
index 5534770,136a4ac..fa57261
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,16 +1,42 @@@
- libkomparediff2 (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++libkomparediff2 (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Merged with Debian
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:34:53 +0000
++ -- Clive Johnston <clivejo at aol.com>  Mon, 08 Feb 2016 20:29:13 +0000
++
+ libkomparediff2 (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:40:07 +0100
  
 +libkomparediff2 (4:15.08.2-0ubuntu2) xenial; urgency=medium
 +
 +  * Fix autopackagetests by adding allow-stderr to the requirements.
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:53 +0100
 +
 +libkomparediff2 (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:58:31 +0100
 +
 +libkomparediff2 (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:42:12 +0100
 +
+ libkomparediff2 (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 31 Aug 2015 10:35:49 +0200
+ 
  libkomparediff2 (4:15.08.0-0ubuntu1) wily; urgency=medium
  
    * new upstream release

-- 
libkomparediff2 packaging