[wesnoth] 01/02: Merge branch 'devel' into zesty-ppa

[Vincent Cheng]

This is an automated email from the git hooks/post-receive script.

vcheng pushed a commit to branch zesty-ppa
in repository wesnoth.

commit 4e5ede0506bff2d521bdd830f013e7dda4c52fc4
Merge: 335454a aae0c68
Author: Vincent Cheng <vcheng at debian.org>
Date:   Sun May 21 00:07:52 2017 -0700

    Merge branch 'devel' into zesty-ppa

 debian/changelog                                 | 23 +++++++++++++++++++++++
 debian/compat                                    |  2 +-
 debian/control                                   | 22 +++++++++++++++++++---
 debian/control.in                                | 22 +++++++++++++++++++---
 debian/patches/03wesnothd-name                   |  8 ++++----
 debian/patches/03wesnothd-name.in                |  8 ++++----
 debian/wesnoth-1.13-data.install                 |  4 +++-
 debian/wesnoth-1.13-data.lintian-overrides       |  4 ++++
 debian/wesnoth-1.13-sota.install                 |  2 ++
 debian/wesnoth-1.13-tools.lintian-overrides      |  2 ++
 debian/wesnoth-BRANCH-data.install.in            |  4 +++-
 debian/wesnoth-BRANCH-data.lintian-overrides.in  |  4 ++++
 debian/wesnoth-BRANCH-sota.install.in            |  2 ++
 debian/wesnoth-BRANCH-tools.lintian-overrides.in |  2 ++
 14 files changed, 92 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index 7fd7d80,7b0e9d0..e57961e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,32 @@@
+ wesnoth-1.13 (1:1.13.8-1) experimental; urgency=medium
+ 
+   * New upstream devel release.
+     - Refresh patches.
+   * Bumped debhelper to compat level 9.
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Sat, 20 May 2017 22:52:42 -0700
+ 
+ wesnoth-1.13 (1:1.13.7-2) experimental; urgency=medium
+ 
+   * Add new package wesnoth-1.13-sota for the newly added mainline campaign,
+     "Secrets of the Ancients". (Closes: #860420)
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Sun, 16 Apr 2017 22:11:44 -0700
+ 
+ wesnoth-1.13 (1:1.13.7-1) experimental; urgency=medium
+ 
+   * New upstream devel release.
+     - Refresh patches.
+   * Install missing lato fonts in wesnoth-1.13-data.
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Sat, 15 Apr 2017 18:01:53 -0700
+ 
 +wesnoth-1.13 (1:1.13.6-1~ppa1~zesty1) zesty; urgency=medium
 +
 +  * Backport devel release from Debian experimental.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Sat, 12 Nov 2016 23:14:38 -0800
 +
  wesnoth-1.13 (1:1.13.6-1) experimental; urgency=medium
  
    * New upstream devel release.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wesnoth.git