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

[Vincent Cheng]

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

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

commit f0df693abc6abe4355cda0e37bb4e678d8bca8a5
Merge: de4005b 9ad66b7
Author: Vincent Cheng <vcheng at debian.org>
Date:   Mon Dec 28 21:04:58 2015 -0800

    Merge branch 'devel' into vivid-ppa

 debian/changelog                               |  9 +++++++++
 debian/patches/02wesnoth-nolog-desktop-file    | 12 ------------
 debian/patches/02wesnoth-nolog-desktop-file.in | 12 ------------
 debian/patches/03wesnothd-name                 |  4 ++--
 debian/patches/03wesnothd-name.in              |  4 ++--
 debian/rules                                   |  4 ----
 debian/wesnoth-1.13-core.install               |  1 -
 debian/wesnoth-1.13-data.install               |  1 -
 debian/wesnoth-1.13-server.tmpfile             |  2 +-
 debian/wesnoth-BRANCH-core.install.in          |  1 -
 debian/wesnoth-BRANCH-data.install.in          |  1 -
 debian/wesnoth-BRANCH-server.tmpfile.in        |  2 +-
 12 files changed, 15 insertions(+), 38 deletions(-)

diff --cc debian/changelog
index ce1f668,e7a8d3d..fc0a3b9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ wesnoth-1.13 (1:1.13.2-1) experimental; urgency=medium
+ 
+   * Upload to experimental.
+   * New upstream devel release.
+     - Refresh patches.
+   * Fix permission error when creating socket with wesnothd. (Closes: #791660)
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Mon, 28 Dec 2015 13:46:42 -0800
+ 
 +wesnoth-1.13 (1:1.13.1-1~ppa1~vivid1) vivid; urgency=medium
 +
 +  * Backport devel release from Debian sid.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Sat, 04 Jul 2015 13:33:33 -0700
 +
  wesnoth-1.13 (1:1.13.1-1) unstable; urgency=medium
  
    * New upstream devel release.

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