[SCM] kmahjongg packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-14-g05d7b24

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 05d7b24804f52bb4233b3e89fbd3fd57a6a26763
Merge: d623c0c661c485732f8f165a1bb8fbd3a4491421 2f3a9533b96a31f4b127322547e0f402cbf962ab
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Mon Feb 8 16:48:06 2016 -0800

    Debian merge: No remaining changes.
    
    * Debian merge: No remaining changes.
    * New upstream release.

 debian/.gitattributes |  1 +
 debian/changelog      | 36 +++++++++++++++++++++++++++++++-----
 debian/control        |  4 ++--
 debian/kmahjongg.menu |  1 -
 debian/watch          |  1 -
 5 files changed, 34 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index c18f3ca,a67d765..d2ed74f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,50 -1,25 +1,77 @@@
- kmahjongg (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++kmahjongg (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
++  [ Clive Johnston ]
 +  * New upstream release
 +
++  [ Scarlett Clark ]
++  * Debian merge: No remaining changes.
++  * New upstream release. 
++
 + -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:02:39 +0000
 +
+ kmahjongg (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:51 +0100
+ 
 +kmahjongg (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:33:22 +0100
 +
 +kmahjongg (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:06:57 +0100
 +
+ kmahjongg (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.2).
+   * New upstream release (15.04.3).
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 19:10:41 +0200
+ 
 +kmahjongg (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:29:59 +0100
 +
 +kmahjongg (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 10:33:43 +0100
 +
 +kmahjongg (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:09:44 +0200
 +
 +kmahjongg (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:27:17 -0700
 +
+ kmahjongg (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>  Mon, 23 Feb 2015 11:11:23 +0100
+ 
  kmahjongg (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kmahjongg packaging