[SCM] openni2/master: Delete removed paragraphs from copyright

jspricke at users.alioth.debian.org jspricke at users.alioth.debian.org
Wed Aug 9 06:41:46 UTC 2017


The following commit has been merged in the master branch:
commit bfe7dbdd2039d3588f4ce329a70df9fa7bb28553
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Wed Aug 9 08:24:19 2017 +0200

    Delete removed paragraphs from copyright

diff --git a/debian/copyright b/debian/copyright
index 54bcb8b..4cf0471 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,22 +17,6 @@ Copyright: 2000, Cass Everitt <cass at r3.nu>
            2000-2001 NVIDIA Corporation
 License: BSD-3-clause-NVIDIA-LICENSE
 
-Files: ThirdParty/GL/GL/glext.h
-       ThirdParty/PSCommon/XnLib/ThirdParty/GL/GL/glext.h
-Copyright: 1991-2004, Silicon Graphics, Inc
-                2005, NVIDIA Corporation
-License: SGI-B-1.1-with-NVIDIA
-
-Files: ThirdParty/GL/GL/wglext.h
-      ThirdParty/PSCommon/XnLib/ThirdParty/GL/GL/wglext.h
-Copyright: 1991-2004, Silicon Graphics, Inc
-License: SGI-B-1.1
-
-Files: ThirdParty/GL/GL/glut.h
-       ThirdParty/PSCommon/XnLib/ThirdParty/GL/GL/glut.h
-Copyright: Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998.
-License: GLUT
-
 Files: ThirdParty/LibJPEG/*
 Copyright: 1991-1998, Thomas G. Lane.
 License: LibJPEG
@@ -260,95 +244,3 @@ License: LibJPEG
     "The Graphics Interchange Format(c) is the Copyright property of
     CompuServe Incorporated.  GIF(sm) is a Service Mark property of
     CompuServe Incorporated."
-
-License: SGI-B-1.1
- License Applicability. Except to the extent portions of this file are
- made subject to an alternative license as permitted in the SGI Free
- Software License B, Version 1.1 (the "License"), the contents of this
- file are subject only to the provisions of the License. You may not use
- this file except in compliance with the License. You may obtain a copy
- of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- .
- http://oss.sgi.com/projects/FreeB
- .
- Note that, as provided in the License, the Software is distributed on an
- "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- .
- Original Code. The Original Code is: OpenGL Sample Implementation,
- Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc.
- Copyright in any portions created by third parties is as indicated
- elsewhere herein. All Rights Reserved.
- .
- Additional Notice Provisions: This software was created using the
- OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
- not been independently verified as being compliant with the OpenGL(R)
- version 1.2.1 Specification.
-
-License: SGI-B-1.1-with-NVIDIA
- Copyright NVIDIA Corporation 2005
- .
- TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED
- *AS IS* AND NVIDIA AND ITS SUPPLIERS DISCLAIM ALL WARRANTIES, EITHER EXPRESS
- OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL
- NVIDIA OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR
- CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR
- LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION,
- OR ANY OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE
- THIS SOFTWARE, EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGES.
- .
- License Applicability. Except to the extent portions of this file are
- made subject to an alternative license as permitted in the SGI Free
- Software License B, Version 1.1 (the "License"), the contents of this
- file are subject only to the provisions of the License. You may not use
- this file except in compliance with the License. You may obtain a copy
- of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
- Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
- .
- http://oss.sgi.com/projects/FreeB
- .
- Note that, as provided in the License, the Software is distributed on an
- "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
- DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
- CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
- PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- .
- Original Code. The Original Code is: OpenGL Sample Implementation,
- Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
- Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc.
- Copyright in any portions created by third parties is as indicated
- elsewhere herein. All Rights Reserved.
- .
- Additional Notice Provisions: This software was created using the
- OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
- not been independently verified as being compliant with the OpenGL(R)
- version 1.2.1 Specification.
-
-License: GLUT
- This program is freely distributable without licensing fees  and is
- provided without guarantee or warrantee expressed or  implied. This
- program is -not- in the public domain.
- .
- The following is from the copyright file of the glut Debian package:
- .
- Regarding the right to modify and distribute this library:
- .
- From: Mark Kilgard <mjk at nvidia.com>
- Subject: Bug#131997: GLUT license
- .
- Anthony,
- .
- > Would it be possible for you to just make it absolutely clear that
- > everyone's allowed to use, copy, and modify (and distribute their
- > modifications) of libglut?
- > 
- > Just quoting the above and replying "Yes, that's fine" or similar
- > would be okay.
- .
- Yes, that's fine.

-- 
openni2 packaging



More information about the pkg-multimedia-commits mailing list