[SCM] InfiniMiner/Minecraft-inspired open game world branch, master, updated. upstream/0.2.20110731.3-21-g1eb4088

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 02c66836db6a7c0d079b63c8f8a9bc0780331432
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Fri Oct 28 22:28:39 2011 -0400

    add more copyright info

diff --git a/debian/changelog b/debian/changelog
index cad2a96..3120b5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ minetest (0.2.20110922.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Disable DM-Upload-Allowed.
+  * Add some more copyright info.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Fri, 28 Oct 2011 22:13:15 -0400
 
diff --git a/debian/copyright b/debian/copyright
index 6ee9b41..c88bbd2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -94,6 +94,32 @@ License: MIT
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
+Files: src/servercommand*
+Copyright: Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55 at gmail.com>
+Copyright: Copyright (C) 2011 Ciaran Gultnieks <ciaran at ciarang.com>
+License: MIT-like license
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Files: util/minetestmapper.py
+Copyright: Copyright (C) 2011 celeron55, Perttu Ahola <celeron55 at gmail.com>
+Copyright: Copyright (C) 2011 j0gge
+License: WTFPL
+ This program is free software. It comes without any warranty, to
+ the extent permitted by applicable law. You can redistribute it
+ and/or modify it under the terms of the Do What The Fuck You Want
+ To Public License, Version 2, as published by Sam Hocevar. See
+ COPYING for more details.
+
 Files: debian/*
 Copyright: 2011 Michael Gilbert <michael.s.gilbert at gmail.com>
 License: GPL-2+

-- 
InfiniMiner/Minecraft-inspired open game world