[SCM] konquest packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-10-g7577c6a

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 7577c6a16ccc50ab5491915b1ac749e824f016db
Merge: e3173064ce698f57c2bd0f55b351424eec3bc104 eb0a9a5a9e12c736dc07c8fb7709db0530153d77
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 6 18:00:49 2016 +0000

    Merged with Debian and New upstream release

 debian/.gitattributes |  1 +
 debian/changelog      | 20 +++++++++++++++++---
 debian/control        |  4 ++--
 debian/konquest.menu  |  1 -
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index a43f013,5f3b8ff..52db6f6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,50 -1,17 +1,65 @@@
- konquest (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++konquest (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Merged with Debian
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:08:21 +0000
++ -- Clive Johnston <clivejo at aol.com>  Sat, 06 Feb 2016 17:59:18 +0000
 +
 +konquest (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:38:15 +0100
 +
 +konquest (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:12:41 +0100
 +
+ konquest (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 19:10:36 +0200
+ 
 +konquest (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:33:19 +0100
 +
 +konquest (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 10:50:23 +0100
 +
 +konquest (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:15:03 +0200
 +
 +konquest (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:18:18 -0700
 +
+ konquest (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:23:07 +0100
+ 
  konquest (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
konquest packaging