[wesnoth] 01/02: Merge remote-tracking branch 'origin/jessie' into wheezy-backports

[Vincent Cheng]

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

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

commit 0d6d9b17f01c74d83b5bef87fe018dd681aee04f
Merge: 6fb5f57 e8ce0fa
Author: Vincent Cheng <vcheng at debian.org>
Date:   Tue Jul 7 02:40:30 2015 -0700

    Merge remote-tracking branch 'origin/jessie' into wheezy-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                                 |  7 +++++++
 debian/patches/CVE-2015-5069-CVE-2015-5070.patch | 23 +++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 31 insertions(+)

diff --cc debian/changelog
index 9f7be5d,876fc64..775283a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
+ wesnoth-1.10 (1:1.10.7-2+deb8u1) jessie; urgency=medium
+ 
+   * Security fix: Disallowed inclusion of .pbl files from WML, independent of
+     extension case (CVE-2015-5069, CVE-2015-5070).
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Wed, 01 Jul 2015 13:30:12 -0700
+ 
 +wesnoth-1.10 (1:1.10.7-2~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +  * Revert changes for ttf-dejavu -> fonts-dejavu-core which isn't in wheezy.
 +
 + -- Rhonda D'Vine <rhonda at debian.org>  Thu, 09 Apr 2015 23:49:59 +0200
 +
  wesnoth-1.10 (1:1.10.7-2) unstable; urgency=high
  
    * Pull af61f9fd from upstream to fix "Private file disclosure through

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