[wesnoth] 01/02: 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 c3807766a90560e86ea4d5274e93270eea3322db
Merge: 2bc7091 97c8f4b
Author: Vincent Cheng <vcheng at debian.org>
Date:   Sun Aug 28 20:11:21 2016 -0700

    Merge branch 'devel' into xenial-ppa

 debian/changelog                         |   9 +
 debian/control                           |   2 +-
 debian/control.in                        |   2 +-
 debian/patches/03wesnothd-name           |   4 +-
 debian/patches/03wesnothd-name.in        |   4 +-
 debian/wesnoth-1.13-core.install         |   2 -
 debian/wesnoth-1.13-core.menu            |  14 --
 debian/wesnoth-1.13-data.install         |   3 +
 debian/wesnoth-1.13-icon.xpm             | 294 -------------------------------
 debian/wesnoth-1.13_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-icon.xpm.in        | 294 -------------------------------
 debian/wesnoth-BRANCH_editor-icon.xpm.in | 225 -----------------------
 15 files changed, 21 insertions(+), 1076 deletions(-)

diff --cc debian/changelog
index c4fb667,d546700..acd9da8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ wesnoth-1.13 (1:1.13.5-1) experimental; urgency=medium
+ 
+   * New upstream devel release.
+     - Refresh patches.
+   * Remove debian/menu file as per tech-ctte decision in #741573.
+   * Bump to Standards-Version 3.9.8.
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Sat, 27 Aug 2016 21:17:33 -0700
+ 
 +wesnoth-1.13 (1:1.13.4-1~ppa1~xenial1) xenial; urgency=medium
 +
 +  * Backport devel release from Debian sid.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Wed, 06 Apr 2016 17:02:30 -0700
 +
  wesnoth-1.13 (1:1.13.4-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