[Pkg-sdl-commits] [SCM] Debian packaging of SDL2 branch, master, updated. debian/1.3.0_20111204-1-45-g9989127

Sun Jan 20 01:59:07 UTC 2013

The following commit has been merged in the master branch:
commit c2a91b1425867b936e7b17eaca336a300cda3c03
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sat Jan 19 19:33:24 2013 +0000

    Enhancements to debian/copyright, fixing some format compliance problems

diff --git a/debian/copyright b/debian/copyright
index 1328bc9..b5cd8bc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,16 +9,12 @@ License: zlib/libpng
 
 Files: SDL/src/libm/*
 Copyright: 1993 by Sun Microsystems, Inc. All rights reserved.
-Comment: From header
-  Developed at SunPro, a Sun Microsystems, Inc. business.
-  Permission to use, copy, modify, and distribute this
-  software is freely granted, provided that this notice
-  is preserved.
+License: SunPro
 
 Files: SDL/src/main/windows/SDL_windows_main.c
            src/main/windows/SDL_windows_main.c
 Copyright: 1998 Sam Lantinga
-License: Public Domain
+License: PublicDomain1
 Comment: SDL_main.c, placed in the public domain by Sam Lantinga  4/13/98
 
 Files: SDL/src/render/mmx.h
@@ -131,7 +127,7 @@ License: zlib/libpng
 Files: test/automated/*
        test/test-automation/src/libSDLtest/common/*
 Copyright: Edgar Simo "bobbens"
-License: Public Domain
+License: PublicDomain2
 Comment:
  Written by Edgar Simo "bobbens"
  .
@@ -143,7 +139,7 @@ Comment: Auto-generated files, no specific information about the original image
 Files: test/testrumble.c
 Copyright: 1997-2011 Sam Lantinga <slouken at libsdl.org>
            2011 Edgar Simo Serra
-License: BSD (3 clause)
+License: BSD_3_clause
 Comment:
   Copyright (C) 1997-2011 Sam Lantinga <slouken at libsdl.org>
   .
@@ -331,3 +327,75 @@ License: MIT/X11
  be used in advertising or otherwise to promote the sale, use or other deal-
  ings in this Software without prior written authorization from the XFree86
  Project.
+
+License: BSD_3_clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+     * Neither the name of the LibQxt project nor the
+       names of its contributors may be used to endorse or promote products
+       derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Comment:
+  Copyright (C) 1997-2011 Sam Lantinga <slouken at libsdl.org>
+  .
+  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.
+  .
+  .
+  Copyright (c) 2011, Edgar Simo Serra
+  All rights reserved.
+  .
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+  .
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the Simple Directmedia Layer (SDL) nor the names of
+      its contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: SunPro
+  Developed at SunPro, a Sun Microsystems, Inc. business.
+  Permission to use, copy, modify, and distribute this
+  software is freely granted, provided that this notice
+  is preserved.
+
+License: PublicDomain1
+ Placed in the public domain by Sam Lantinga  4/13/98
+
+License: PublicDomain2
+ Released under Public Domain.

-- 
Debian packaging of SDL2

