[SCM] kolourpaint packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-20-g7f53cba

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 7f53cba6e66a01705c091911f28e8f996ff8c83e
Merge: 3e8a6711863fc60f69db5cf0cedee71a30ff1432 51a533486dac12d05e7d4d4eeb0c9ac273d66ecd
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 6 17:48:25 2016 +0000

    Merged with Debian

 debian/.gitattributes |  1 +
 debian/changelog      | 66 ++++++++++++++++++++++++++++++++++++---------------
 debian/control        |  6 ++---
 3 files changed, 51 insertions(+), 22 deletions(-)

diff --cc debian/changelog
index 808cd7d,a116b59..2c7faa9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,30 +1,72 @@@
- kolourpaint (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++kolourpaint (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:31 +0000
++ -- Clive Johnston <clivejo at aol.com>  Sat, 06 Feb 2016 17:47:42 +0000
++
+ kolourpaint (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:24:33 +0100
+ 
+ kolourpaint (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:08 +0100
  
 +kolourpaint (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:37:35 +0100
 +
 +kolourpaint (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:12:00 +0100
 +
+ kolourpaint (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>  Sat, 19 Sep 2015 19:11:08 +0200
+ 
 +kolourpaint (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:32:48 +0100
 +
 +kolourpaint (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 10:49:49 +0100
 +
 +kolourpaint (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * New upstream release
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 19:14:06 +0200
 +
+ kolourpaint (4:14.12.3-1) experimental; urgency=medium
+ 
+   * New upstream release (14.12.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 29 Mar 2015 15:13:36 +0200
+ 
  kolourpaint (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kolourpaint packaging