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

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit b83ae3907246c7bcb23e05bfd61f6d5e43c1dab1
Merge: a8a379341b4d0537c4499d856ee0d1267dd1e40e dde3b9848ffbf3de84e195b92afc29086633fe67
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Feb 8 19:43:44 2016 +0000

    Merged with Debian and New upstream release

 debian/.gitattributes |  1 +
 debian/changelog      | 40 +++++++++++++++++++++++++++++++++++-----
 debian/control        |  4 ++--
 debian/palapeli.menu  |  1 -
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 8d108bb,2331678..1b4f990
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,56 -1,33 +1,87 @@@
- palapeli (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++palapeli (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:40:45 +0000
++ -- Clive Johnston <clivejo at aol.com>  Mon, 08 Feb 2016 19:42:45 +0000
++
+ palapeli (4:15.12.0-1) experimental; urgency=medium
+ 
+   * New upstream release (15.12.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:22:41 +0100
+ 
+ palapeli (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:53 +0100
  
 +palapeli (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 13:04:31 +0100
 +
 +palapeli (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:45:10 +0100
 +
 +palapeli (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 18:20:21 +0100
 +
 +palapeli (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 12:30:53 +0100
 +
+ palapeli (4:15.04.2-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 19:10:28 +0200
+ 
 +palapeli (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * Fix kdelibs version
 +  * 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 22:41:07 +0200
 +
 +palapeli (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * Add back kdelibs parent version depends. 
 +  * New upstream release
 +  * Fix kdelibs5 version in build depends
 +  * libkdegames was renamed to 4 to accommodate 4 and 5. 
 +  * Undo libkdegames change, -dev was not changed. 
 +  * Spelling error
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:08:03 -0700
 +
+ palapeli (4:14.12.2-1) experimental; urgency=medium
+ 
+   * New upstream release (14.12.2).
+ 
+   [ Scarlett Clark ]
+   * Add back kdelibs parent version depends.
+ 
+   [ Maximiliano Curia ]
+   * Bump Standards-Version to 3.9.6, no changes needed.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 23 Feb 2015 09:06:08 +0100
+ 
  palapeli (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
palapeli packaging