[SCM] khangman packaging branch, master, updated. debian/4%17.08.3-2-57-gcf2daea

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 067332fea92111b31b7c7e2f27dfe176b27803fc
Merge: 029b7ef048c3ff31f1717fa59401519bad971ca7 b4aed2b22d81cbce53178480b4bfcb25604f1854
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jun 16 13:08:59 2016 +0100

    merge master

 debian/changelog         | 12 +++++++++---
 debian/control           |  6 +++---
 debian/khangman.install  |  2 +-
 debian/upstream/metadata |  7 +++++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 20aebd2,7e07b97..033fb9e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,13 +1,20 @@@
 +khangman (4:16.04.2-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Thu, 16 Jun 2016 11:08:44 +0000
 +
- khangman (4:16.04.1-0neon) xenial; urgency=medium
+ khangman (4:16.04.1-1) unstable; urgency=medium
  
-   * New release
+   [ Automatic packaging ]
+   * Bump Standards-Version to 3.9.8
+ 
+   [ Maximiliano Curia ]
+   * Add upstream metadata (DEP-12)
+   * debian/control: Update Vcs-Browser and Vcs-Git fields
  
-  -- Neon CI <neon at kde.org>  Wed, 18 May 2016 18:15:56 +0200
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 26 May 2016 00:47:54 +0200
++>>>>>>> master
  
  khangman (4:15.12.1-1) experimental; urgency=medium
  

-- 
khangman packaging