[Merge] ~mterry/kubuntu-packaging/+git/kmahjongg:master into ~kubuntu-packagers/kubuntu-packaging/+git/kmahjongg:kubuntu_zesty_archive

[Simon Quigley]

Review: Needs Fixing

Thanks for the merge proposal! :)

I left a comment below, if you just remove the merge markers and fix that, I'll merge this.

Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index e497d68..6228479 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,8 +1,16 @@
> +<<<<<<< debian/changelog
>  kmahjongg (4:16.04.3-0ubuntu2) UNRELEASED; urgency=medium

Please change this line to have 4:16.04.3-0ubuntu3 as the version.

>  
>    * Update Vcs-Git fields to use https:// instead of git://
>  
>   -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sat, 29 Oct 2016 17:16:37 +0200
> +=======
> +kmahjongg (4:16.04.3-0ubuntu2) zesty; urgency=medium
> +
> +  * added missing dependency to kdegames-mahjongg-data-kf5 (LP: #1634250)
> +
> + -- Lars Bischoff <lbischoff at gmx.de>  Sun, 13 Nov 2016 18:51:43 +0100
> +>>>>>>> debian/changelog
>  
>  kmahjongg (4:16.04.3-0ubuntu1) yakkety; urgency=medium
>  


-- 
https://code.launchpad.net/~mterry/kubuntu-packaging/+git/kmahjongg/+merge/311447
Your team Kubuntu Packagers is subscribed to branch ~kubuntu-packagers/kubuntu-packaging/+git/kmahjongg:kubuntu_zesty_archive.