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

[Vincent Cheng]

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

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

commit 51f5a8cea8914666172506f4a45c2fa58987b187
Merge: 56d2a70 249a3af
Author: Vincent Cheng <vcheng at debian.org>
Date:   Wed Apr 6 17:01:24 2016 -0700

    Merge branch 'devel' into xenial-ppa

 debian/changelog                                 | 13 +++++++++++++
 debian/control                                   | 13 ++++++-------
 debian/control.in                                | 13 ++++++-------
 debian/patches/03wesnothd-name                   |  8 ++++----
 debian/patches/03wesnothd-name.in                |  8 ++++----
 debian/rules                                     |  2 +-
 debian/wesnoth-1.13-data.lintian-overrides       |  2 --
 debian/wesnoth-1.13-tools.lintian-overrides      |  3 +++
 debian/wesnoth-BRANCH-data.lintian-overrides.in  |  2 --
 debian/wesnoth-BRANCH-tools.lintian-overrides.in |  3 +++
 10 files changed, 40 insertions(+), 27 deletions(-)

diff --cc debian/changelog
index a46dbc6,ce7a697..0db713b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ wesnoth-1.13 (1:1.13.4-1) experimental; urgency=medium
+ 
+   * New upstream devel release.
+     - Build against SDL 2 by default. Remove SDL 1.2 build-deps and add
+       build-deps: libsdl2-image-dev (>= 2.0.0), libsdl2-mixer-dev (>= 2.0.0),
+       libsdl2-net-dev (>= 2.0.0), libsdl2-ttf-dev (>= 2.0.8),
+       libsdl2-dev (>= 2.0.2).
+     - Refresh patches.
+   * Drop dependency on fonts-droid. (Closes: #804692)
+   * Bump to Standards-Version 3.9.7.
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Tue, 05 Apr 2016 21:37:36 -0700
+ 
 +wesnoth-1.13 (1:1.13.2-1~ppa1~xenial1) xenial; urgency=medium
 +
 +  * Backport devel release from Debian sid.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Mon, 28 Dec 2015 21:11:46 -0800
 +
  wesnoth-1.13 (1:1.13.2-1) experimental; urgency=medium
  
    * Upload to experimental.

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