[SCM] knavalbattle packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-21-ga8e3614

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit a8e3614c420d776de95edcd24cae0204962217f4
Merge: e0513a7233125ab5d7545228deb1cc940df98f67 7c9b25805d58a6c8ba37649edb210a79fbd96727
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 6 17:23:12 2016 +0000

    Merging with Debian

 debian/.gitattributes       |  1 +
 debian/changelog            | 35 +++++++++++++++++++++++++++--------
 debian/control              | 14 ++++++--------
 debian/knavalbattle.install | 19 ++++---------------
 4 files changed, 38 insertions(+), 31 deletions(-)

diff --cc debian/changelog
index 9d77d2c,6b86d3a..e4a2137
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,15 +1,61 @@@
- knavalbattle (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
- 
-   [ Clive Johnston ]
-   * New upstream release
++knavalbattle (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Ovidiu-Florin BOGDAN ]
 +  * Update build-deps and install files list for the KF5 port
 +
++  [ Clive Johnston ]
++  * New upstream release
++  * Merged with Debian
++
 + -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:05:43 +0000
 +
+ knavalbattle (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:24:16 +0100
+ 
 +knavalbattle (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:36:16 +0100
 +
 +knavalbattle (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:10:52 +0100
 +
 +knavalbattle (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:31:56 +0100
 +
 +knavalbattle (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 10:48:42 +0100
 +
 +knavalbattle (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * kde4 games need to depend on the 14.12 series libkdegames 
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 19:12:13 +0200
 +
+ knavalbattle (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:16 +0200
+ 
  knavalbattle (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
knavalbattle packaging