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

[Vincent Cheng]

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

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

commit 7d81e8efb27323c11f881949fe32025a959a9819
Merge: ba2d2f2 a3713bf
Author: Vincent Cheng <vcheng at debian.org>
Date:   Sun Jan 3 18:49:20 2016 -0800

    Merge branch 'master' into wheezy-backports-sloppy

 .gitignore       |  2 ++
 debian/changelog | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --cc debian/changelog
index 1989b82,4a5b9fd..5e7c38a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,13 +1,27 @@@
+ wesnoth-1.12 (1:1.12.5-1) unstable; urgency=medium
+ 
+   [ Vincent Cheng ]
+   * Fix permission error when creating socket with wesnothd. (Closes: #791660)
+ 
+   [ Rhonda D'Vine ]
+   * New upstream stable release.
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Mon, 28 Dec 2015 13:49:43 -0800
+ 
 +wesnoth-1.12 (1:1.12.4-1~bpo7+2) wheezy-backports-sloppy; urgency=medium
 +
 +  * Drop build-dep on dh-systemd; currently wheezy-bpo-sloppy buildds are not
 +    set up to allow build-deps on packages in wheezy-bpo.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Wed, 15 Jul 2015 20:25:01 -0700
 +
 +wesnoth-1.12 (1:1.12.4-1~bpo7+1) wheezy-backports-sloppy; urgency=medium
 +
 +  * Rebuild for wheezy-backports-sloppy.
 +  * Depend on ttf-dejavu-core (instead of fonts-dejavu-core) which is in wheezy.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Tue, 07 Jul 2015 02:10:34 -0700
 +
  wesnoth-1.12 (1:1.12.4-1) unstable; urgency=medium
  
    * New upstream stable release.

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