[SCM] kolf packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-12-g4c9b858

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 4c9b858d341944652cba6fb1cb9e0020a5d23a06
Merge: e461b3cb434dbee641476787378d65a0ff67fb66 7cce7621dccec3b2ba4b454a2f514c49e631eea8
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 6 17:32:26 2016 +0000

    Merging with Debian

 debian/changelog | 26 +++++++++++++++++++++++---
 debian/control   |  4 ++--
 debian/kolf.menu |  1 -
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 31371c7,9738e2c..7613c21
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,50 -1,23 +1,71 @@@
- kolf (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++kolf (4:15.08.3-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Merged with Debian 
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:06:36 +0000
++ -- Clive Johnston <clivejo at aol.com>  Sat, 06 Feb 2016 17:30:48 +0000
++
+ kolf (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:39:31 +0100
  
 +kolf (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:36:59 +0100
 +
 +kolf (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:25 +0100
 +
 +kolf (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:32:23 +0100
 +
 +kolf (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 10:49:15 +0100
 +
+ kolf (4:15.04.2-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 19:10:35 +0200
+ 
 +kolf (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * kde4 games need to depend on 14.12 series libkdegames. 
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 19:13:07 +0200
 +
 +kolf (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:45:46 -0700
 +
+ kolf (4:14.12.2-1) experimental; urgency=medium
+ 
+   * New upstream release (14.12.2).
+   * Bump Standards-Version to 3.9.6, no changes needed.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Feb 2015 16:43:18 +0100
+ 
  kolf (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kolf packaging