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

[Vincent Cheng]

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

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

commit 5d96277ea050ae9d7c1f82d72c599710ca8a7411
Merge: 7e388d8 3e5abf5
Author: Vincent Cheng <vcheng at debian.org>
Date:   Tue Jul 7 02:09:54 2015 -0700

    Merge branch 'master' into jessie-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                        |   21 +
 debian/control                          |   49 +-
 debian/control.in                       |   49 +-
 debian/copyright                        |   24 +
 debian/missing-sources/README.txt       |    9 +
 debian/missing-sources/jquery.js        | 3549 +++++++++++++++++++++++++++++++
 debian/missing-sources/tablesorter.js   | 1031 +++++++++
 debian/rules                            |    7 +-
 debian/wesnoth-1.12-data.docs           |    2 +-
 debian/wesnoth-1.12-nolog               |    2 +-
 debian/wesnoth-1.12-server.service      |   10 +
 debian/wesnoth-1.12-server.tmpfile      |    1 +
 debian/wesnoth-BRANCH-data.docs.in      |    2 +-
 debian/wesnoth-BRANCH-nolog.in          |    2 +-
 debian/wesnoth-BRANCH-server.service.in |   10 +
 debian/wesnoth-BRANCH-server.tmpfile.in |    1 +
 16 files changed, 4756 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index dc6644b,25bed87..425725b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,30 @@@
+ wesnoth-1.12 (1:1.12.4-1) unstable; urgency=medium
+ 
+   * New upstream stable release.
+     - Security fix: Disallowed inclusion of .pbl files from WML, independent of
+       extension case (CVE-2015-5069, CVE-2015-5070).
+   * Add missing jquery+tablesorter source files. (Closes: #788381)
+   * Remove build-dep on deprecated python-support. (Closes: #786135)
+   * Add missing copyright entry for fonts/DroidSans*.ttf. (Closes: #789373)
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Sun, 28 Jun 2015 23:45:56 -0700
+ 
+ wesnoth-1.12 (1:1.12.2-2) unstable; urgency=medium
+ 
+   * Add metapackages for wesnoth{,-core,-music} since 1.12 is a stable branch.
+   * Add systemd service file for wesnoth-1.12-server. (Closes: #780854)
+     - Add build-depends on dh-systemd (>= 1.5).
+   * Fix spurious update-rc.d warnings. (Closes: #783598)
+   * Fixup nolog script. (Closes: #783600)
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Tue, 28 Apr 2015 01:50:44 -0700
+ 
 +wesnoth-1.12 (1:1.12.2-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Rhonda D'Vine <rhonda at debian.org>  Tue, 21 Apr 2015 09:46:12 +0200
 +
  wesnoth-1.12 (1:1.12.2-1) unstable; urgency=medium
  
    * New upstream stable release, containing a fix for "Private file disclosure

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