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

[Gerfried Fuchs]

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

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

commit 57d338421eda63b93b5ea43b4228f84b85e72ca4
Merge: 85e5edf c54978a
Author: Rhonda D'Vine <rhonda at debian.org>
Date:   Thu Apr 9 23:48:00 2015 +0200

    Merge branch 'jessie' into wheezy-backports
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/control.in
    	debian/rules

 debian/changelog                                   | 20 ++++++++
 debian/control                                     | 10 ++--
 debian/control.in                                  | 10 ++--
 debian/patches/02wesnoth-nolog-desktop-file        |  8 ++--
 debian/patches/02wesnoth-nolog-desktop-file.in     |  8 ++--
 debian/patches/03wesnothd-name                     |  8 +---
 debian/patches/03wesnothd-name.in                  |  8 +---
 .../af61f9fdd15cd439da9e2fe5fa39d174c923eaae.patch | 53 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       | 16 +++++--
 debian/wesnoth-1.10-data.lintian-overrides         |  2 +-
 debian/wesnoth-BRANCH-data.lintian-overrides.in    |  2 +-
 12 files changed, 110 insertions(+), 36 deletions(-)

diff --cc debian/changelog
index 95207ca,94c23e3..1bdb645
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,29 @@@
+ wesnoth-1.10 (1:1.10.7-2) unstable; urgency=high
+ 
+   * Pull af61f9fd from upstream to fix "Private file disclosure through
+     get_wml_location()" (CVE-2015-0844)
+ 
+  -- Rhonda D'Vine <rhonda at debian.org>  Wed, 08 Apr 2015 11:05:06 +0200
+ 
+ wesnoth-1.10 (1:1.10.7-1) unstable; urgency=low
+ 
+   * New upstream stable release.
+     - Refresh patches.
+   * Fix FTBFS on alpha due to relocation errors during linking.
+     (Closes: #720158)
+   * Fully enable build hardening.
+   * Depend on fonts-dejavu-core (instead of transitional ttf-dejavu package).
+   * Bump to Standards-Version 3.9.4.
+   * Fix lintian warning vcs-field-not-canonical.
+ 
+  -- Vincent Cheng <Vincentc1208 at gmail.com>  Mon, 19 Aug 2013 01:07:46 -0700
+ 
 +wesnoth-1.10 (1:1.10.6-2~bpo70+1) wheezy-backports; urgency=low
 +
 +  * No change backport of new upstream release for wheezy.
 +
 + -- Vincent Cheng <Vincentc1208 at gmail.com>  Thu, 16 May 2013 00:39:43 -0700
 +
  wesnoth-1.10 (1:1.10.6-2) unstable; urgency=low
  
    * Upload to unstable.

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