[minetest-v04x] 01/01: Fix dep5-copyright-license-name-not-unique

[Vincent Cheng]

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

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

commit 92c86bd66dd0152bfed48f8454f4865bba4a6d00
Author: Vincent Cheng <vcheng at debian.org>
Date:   Tue Mar 17 14:03:20 2015 -0700

    Fix dep5-copyright-license-name-not-unique
---
 debian/copyright | 72 ++++++++++++++++++++++----------------------------------
 1 file changed, 28 insertions(+), 44 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e876c26..2f2ecd9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,6 +28,15 @@ Files: src/sha1.cpp
 Copyright: Copyright (c) 2005 Michael D. Leonhard (http://tamale.net)
 License: Expat
 
+Files: src/base64.*
+Copyright: 2004-2008, René Nyffenegger
+           Nyffenegger rene.nyffenegger at adp-gmbh.ch
+License: zlib
+
+Files: src/cguittfont/*
+Copyright: 2009-2010 John Norman
+License: zlib
+
 Files:
  src/guiPasswordChange.*
  src/guiVolumeChange.*
@@ -50,28 +59,6 @@ License: ISC
  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  PERFORMANCE OF THIS SOFTWARE.
 
-Files: src/base64.*
-Copyright: 2004-2008, René Nyffenegger
-           Nyffenegger rene.nyffenegger at adp-gmbh.ch
-License: zlib
- This source code is provided 'as-is', without any express or implied
- warranty. In no event will the author be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this source code must not be misrepresented; you must not
- claim that you wrote the original source code. If you use this source code
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- .
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original source code.
- .
- 3. This notice may not be removed or altered from any source distribution.
-
 Files: util/minetestmapper.py
 Copyright:
  2011, celeron55, Perttu Ahola <celeron55 at gmail.com>
@@ -86,28 +73,6 @@ License: WTFPL
  .
  0. You just DO WHAT THE FUCK YOU WANT TO.
 
-Files: src/cguittfont/*
-Copyright: 2009-2010 John Norman
-License: zlib
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
-    1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- .
-    2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- .
-    3. This notice may not be removed or altered from any source
-    distribution.
-
 Files: src/noise.*
 Copyright: 2010-2014, celeron55, Perttu Ahola <celeron55 at gmail.com>
            2010-2014, kwolekr, Ryan Kwolek <kwolekr at minetest.net>
@@ -374,3 +339,22 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: zlib
+ This source code is provided 'as-is', without any express or implied
+ warranty. In no event will the author be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this source code must not be misrepresented; you must not
+ claim that you wrote the original source code. If you use this source code
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original source code.
+ .
+ 3. This notice may not be removed or altered from any source distribution.

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