[wesnoth] 01/03: Merge tag 'debian/1.10.3-3+deb7u1' into squeeze-backports

[Gerfried Fuchs]

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

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

commit d615144307ffe1a20e0a52f756665302c8bb7861
Merge: f0066ef 2b2090f
Author: Rhonda D'Vine <rhonda at debian.org>
Date:   Fri Apr 10 10:54:27 2015 +0200

    Merge tag 'debian/1.10.3-3+deb7u1' into squeeze-backports
    
    Uploaded to wheezy-security
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   | 21 +++++++++
 debian/control                                     |  2 +-
 debian/control.in                                  |  2 +-
 .../af61f9fdd15cd439da9e2fe5fa39d174c923eaae.patch | 53 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  4 +-
 debian/wesnoth-core.postinst                       | 17 +++++++
 debian/wesnoth-core.postinst.in                    | 17 +++++++
 debian/wesnoth-music.postinst                      | 17 +++++++
 debian/wesnoth-music.postinst.in                   | 17 +++++++
 debian/wesnoth.postinst                            | 17 +++++++
 debian/wesnoth.postinst.in                         | 17 +++++++
 12 files changed, 181 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 0685bd8,a1c3985..76b437b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,30 @@@
+ wesnoth-1.10 (1:1.10.3-3+deb7u1) wheezy-security; 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.3-3) unstable; urgency=low
+ 
+   * Team upload.
+   * Revert /usr/share/doc/wesnoth back into a symlink. (Closes: #688712)
+ 
+  -- Vincent Cheng <Vincentc1208 at gmail.com>  Wed, 21 Nov 2012 23:55:27 -0800
+ 
+ wesnoth-1.10 (1:1.10.3-2) unstable; urgency=low
+ 
+   [ Vincent Cheng ]
+   * Fix broken font symlink in debian/rules. (closes: #681556)
+ 
+  -- Gerfried Fuchs <rhonda at debian.org>  Sun, 02 Sep 2012 13:11:51 +0200
+ 
 +wesnoth-1.10 (1:1.10.3-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +
 + -- Gerfried Fuchs <rhonda at debian.org>  Mon, 11 Jun 2012 19:50:48 +0200
 +
  wesnoth-1.10 (1:1.10.3-1) unstable; urgency=low
  
    * New upstream stable release (closes: #676460)

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