[SCM] kshisen packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-16-g8edda2e

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 8edda2e7cacf4c2363668d26f77ed29a01cf553b
Merge: b3f0dbd5a4d7f466b6f53914aa8bdc11b1cb7330 254af5449808b89563d2f0e41561de1c51048b48
Author: Clive Johnston <clivejo at aol.com>
Date:   Thu Feb 11 12:24:14 2016 +0000

    Merged with Debian and New upstream release

 debian/.gitattributes |  1 +
 debian/changelog      | 19 ++++++++++++++++---
 debian/control        | 39 +++++----------------------------------
 debian/copyright      | 41 ++++++++++++++++++++++++++++++-----------
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --cc debian/changelog
index d60fcfd,9ef11a3..a5e345b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,35 @@@
- kshisen (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++kshisen (4:15.12.1-1ubuntu1) UNRELEASED; urgency=medium
 +
-   * New upstream release
++  * Merged with Debian
++  * New upstream release 
++
++ -- Clive Johnston <clivejo at aol.com>  Thu, 11 Feb 2016 12:22:46 +0000
++
+ kshisen (4:15.12.1-1) experimental; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.1).
+   * New upstream release (15.08.0).
+   * Drop version in the kdegames-mahjongg-data-kf5 dependency, making it
+     installable.
+   * New upstream release (15.12.0).
+   * New upstream release (15.12.1).
  
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:15:21 +0000
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:24:07 +0100
  
 +kshisen (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:44:05 +0100
 +
 +kshisen (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:22:30 +0100
 +
  kshisen (4:15.08.0-0ubuntu1) wily; urgency=medium
  
    * new upstream release

-- 
kshisen packaging