[SCM] kollision packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-12-g45dc4d3

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 45dc4d3ce4c69636ce13deb6bad0653f9320c9d5
Merge: d6594e4f66bf3bb56721cd3562aab3cc9b4b8d2f cf32593b860ac0ac6b9a9a39742c573a7cd2870e
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 6 17:44:47 2016 +0000

    Merge with Debian

 debian/.gitattributes |  1 +
 debian/changelog      | 26 +++++++++++++++++++++--
 debian/control        | 58 +++++++++++++++------------------------------------
 debian/copyright      | 24 +++++++++++++--------
 4 files changed, 57 insertions(+), 52 deletions(-)

diff --cc debian/changelog
index c65cde1,ac980a6..59c01e2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,24 +1,44 @@@
- kollision (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++kollision (4:15.12.1-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Merged with Debian 
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:07:00 +0000
++ -- Clive Johnston <clivejo at aol.com>  Sat, 06 Feb 2016 17:43:58 +0000
++
+ kollision (4:15.12.1-1) experimental; urgency=medium
+ 
+   * New upstream release (15.12.0).
+   * New upstream release (15.12.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:22:29 +0100
+ 
+ kollision (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:44 +0100
  
 +kollision (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:37:16 +0100
 +
 +kollision (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:11:42 +0100
 +
+ kollision (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.1).
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 10 Sep 2015 09:23:20 +0200
+ 
  kollision (4:15.08.0-0ubuntu1) wily; urgency=medium
  
    * new upstream release

-- 
kollision packaging