[java3d] 76/77: Fixed some duplicate license short ids in debian/copyright

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository java3d.

commit d1ef3fd9eca5c6542a29953dc07db24eab68d0bc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 8 12:13:04 2018 +0100

    Fixed some duplicate license short ids in debian/copyright
---
 debian/changelog |  1 +
 debian/copyright | 67 ++++----------------------------------------------------
 2 files changed, 5 insertions(+), 63 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ebb35af..42d0f62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ java3d (1.5.2+dfsg-12) UNRELEASED; urgency=medium
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
+  * Fixed some duplicate license short ids in debian/copyright
 
  -- tony mancill <tmancill at debian.org>  Sun, 04 Jan 2015 10:09:51 -0800
 
diff --git a/debian/copyright b/debian/copyright
index f1c48be..ae16ce4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Java 3D
 Source: http://java3d.java.net
 
@@ -53,7 +53,7 @@ License: MIT
 Files: j3d-core/src/native/ogl/glext.h
        j3d-core/src/native/ogl/wglext.h
 Copyright: 2007, The Khronos Group Inc.
-License: MIT
+License: MIT-khronos
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and/or associated documentation
  files (the "Materials"), to deal in the Materials without
@@ -76,66 +76,7 @@ License: MIT
 
 Files: j3d-core-utils/*
 Copyright: 2007, Sun Microsystems, Inc. All rights reserved.
-License: other
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- - Redistribution of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- .
- - Redistribution 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 Sun Microsystems, Inc. or the names of
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
- .
- This software is provided "AS IS," without a warranty of any
- kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT
- BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING,
- MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO
- EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
- PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
- INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE
- THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE
- THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGES.
- .
- You acknowledge that this software is not designed, licensed or
- intended for use in the design, construction, operation or
- maintenance of any nuclear facility.
-
-Files: j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/BBox.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Basic.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/BottleNeck.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Bridge.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Clean.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Degenerate.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Distance.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/EarClip.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Heap.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/HeapNode.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Left.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/ListNode.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/NoHash.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Orientation.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/PntNode.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Project.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Simple.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/StripifierStats.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Triangle.java
-       j3d-core-utils/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java
-Copyright: 2007, Sun Microsystems, Inc. All rights reserved.
-License: other
+License: BSD-2-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -214,7 +155,7 @@ Files: j3d-core-utils/src/classes/share/com/sun/j3d/utils/applet/MainFrame.java
        j3d-core-utils/src/classes/share/com/sun/j3d/utils/applet/JMainFrame.java
 Copyright: 2007, Sun Microsystems, Inc. All rights reserved.
            1996, Jef Poskanzer <jef at acme.com>.  All rights reserved.
-License: other or BSD
+License: other or BSD-2-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java3d.git