[minetest-v04x] 06/10: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/minetest-v04x

[Martin Quinson]

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

mquinson pushed a commit to branch master
in repository minetest-v04x.

commit 465ffccc74734a13bcbf6fc08b282bfaa0dec916
Merge: 2d68794 033cb41
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Tue May 17 07:20:25 2016 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/minetest-v04x

 debian/changelog                |   13 +
 debian/control                  |    8 +-
 debian/copyright                | 1298 ++++++++++++++++++++++++++++++++++++++-
 debian/minetest-server.service  |    1 +
 debian/minetest-server at .service |    1 +
 debian/minetest.conf            |    6 +
 debian/patches/rawlua.patch     |    2 +-
 7 files changed, 1312 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index f87fd0c,4244487..c03e5df
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
 +minetest (0.4.14+repack-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Martin Quinson <mquinson at debian.org>  Tue, 17 May 2016 06:59:24 +0200
 +
+ minetest (0.4.13+repack-2) unstable; urgency=medium
+ 
+   * service files: Add RequiresMountsFor=/var/games/minetest-server.
+   * Vcs-Browser: Use https.
+   * Update my e-mail address.
+   * Declare compliance with Debian Policy 3.9.7.
+   * Vcs-Git: Use https.
+   * Update minetest.conf: Mention default value for ipv6_server.
+     (Closes: #814012)
+   * Update debian/copyright and add missing licenses. (Closes: #815098)
+ 
+  -- Markus Koschany <apo at debian.org>  Sat, 27 Feb 2016 18:59:09 +0100
+ 
  minetest (0.4.13+repack-1) unstable; urgency=medium
  
    * New upstream release.

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