[wesnoth] 01/01: Merge branch 'master' into jessie-backports

[Vincent Cheng]

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

vcheng pushed a commit to branch jessie-backports
in repository wesnoth.

commit 01560a12ff49acf437384bc03037313a769d149c
Merge: d3ff593 35bfbee
Author: Vincent Cheng <vcheng at debian.org>
Date:   Mon May 23 15:48:02 2016 -0700

    Merge branch 'master' into jessie-backports

 debian/changelog                                 |   9 +
 debian/control                                   |   7 +-
 debian/control.in                                |   7 +-
 debian/rules                                     |   2 +-
 debian/wesnoth-1.12-core.install                 |   2 -
 debian/wesnoth-1.12-core.menu                    |  14 --
 debian/wesnoth-1.12-data.install                 |   3 +
 debian/wesnoth-1.12-data.lintian-overrides       |   2 -
 debian/wesnoth-1.12-icon.xpm                     | 294 -----------------------
 debian/wesnoth-1.12-tools.lintian-overrides      |   3 +
 debian/wesnoth-1.12_editor-icon.xpm              | 225 -----------------
 debian/wesnoth-BRANCH-core.install.in            |   2 -
 debian/wesnoth-BRANCH-core.menu.in               |  14 --
 debian/wesnoth-BRANCH-data.install.in            |   3 +
 debian/wesnoth-BRANCH-data.lintian-overrides.in  |   2 -
 debian/wesnoth-BRANCH-icon.xpm.in                | 294 -----------------------
 debian/wesnoth-BRANCH-tools.lintian-overrides.in |   3 +
 debian/wesnoth-BRANCH_editor-icon.xpm.in         | 225 -----------------
 18 files changed, 28 insertions(+), 1083 deletions(-)

diff --cc debian/changelog
index f48276b,b1eec81..c7fd0f2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ wesnoth-1.12 (1:1.12.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Remove debian/menu file as per tech-ctte decision in #741573.
+   * Drop dependency on fonts-droid. (Closes: #804691)
+   * Bump to Standards-Version 3.9.8.
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Fri, 20 May 2016 23:42:57 -0700
+ 
 +wesnoth-1.12 (1:1.12.5-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Thu, 31 Dec 2015 00:24:07 -0800
 +
  wesnoth-1.12 (1:1.12.5-1) unstable; urgency=medium
  
    [ Vincent Cheng ]

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