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

[Vincent Cheng]

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

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

commit 91c2130a58ac7e0fe28b7fd87eab5dfb5f32ff8a
Merge: 3596d36 5d681a5
Author: Vincent Cheng <vcheng at debian.org>
Date:   Sat Nov 12 23:18:21 2016 -0800

    Merge branch 'devel' into yakkety-ppa

 debian/changelog                      | 11 +++++++++++
 debian/control                        |  4 ++--
 debian/control.in                     |  4 ++--
 debian/patches/03wesnothd-name        | 16 ++++++++--------
 debian/patches/03wesnothd-name.in     | 16 ++++++++--------
 debian/rules                          |  6 +++---
 debian/wesnoth-1.13-data.install      |  3 +++
 debian/wesnoth-BRANCH-data.install.in |  3 +++
 8 files changed, 40 insertions(+), 23 deletions(-)

diff --cc debian/changelog
index f94d52d,5bf583a..55b1ee5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
+ wesnoth-1.13 (1:1.13.6-1) experimental; urgency=medium
+ 
+   * New upstream devel release.
+     - Drop build-dep on libsdl2-net-dev.
+     - Bump minimum version of build-dep libsdl2-dev to (>= 2.0.4).
+     - Refresh patches.
+   * Build with -std=c++11 to fix FTBFS on older distros (e.g. Debian 8,
+     Ubuntu 16.04) where this flag is not enabled by gcc by default.
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Fri, 11 Nov 2016 14:59:19 -0800
+ 
 +wesnoth-1.13 (1:1.13.5-1~ppa1~yakkety1) yakkety; urgency=medium
 +
 +  * Backport devel release from Debian experimental.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Sun, 28 Aug 2016 20:04:31 -0700
 +
  wesnoth-1.13 (1:1.13.5-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