[java3d] 67/77: address lintian warning: pipe-symbol-used-as-license-disjunction

[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 be2c0638a669fd7e942a31536f2eb3e9404a5fa6
Author: Tony Mancill <tmancill at debian.org>
Date:   Sun Jan 4 18:11:47 2015 +0000

    address lintian warning: pipe-symbol-used-as-license-disjunction
---
 debian/changelog | 8 ++++++++
 debian/copyright | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d775dc..b118ef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+java3d (1.5.2+dfsg-12) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Address lintian warnings: pipe-symbol-used-as-license-disjunction
+    and invalid-short-name-in-dep5-copyright in debian/copyright.
+
+ -- tony mancill <tmancill at debian.org>  Sun, 04 Jan 2015 10:09:51 -0800
+
 java3d (1.5.2+dfsg-11) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/copyright b/debian/copyright
index 8e28774..f1c48be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -172,7 +172,7 @@ License: other
 
 Files: j3d-core-utils/src/classes/share/com/sun/j3d/internal/Distance.java
 Copyright: 2007, Sun Microsystems, Inc. All rights reserved.
-License: other | LGPL-2.1
+License: other or LGPL-2.1
  On Debian systems the full text of the GNU Lesser General Public License can be
  found in the `/usr/share/common-licenses/LGPL-2.1' file.
  .
@@ -214,7 +214,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 | BSD
+License: other or BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -247,6 +247,6 @@ License: other | BSD
 
 Files: debian/*
 Copyright: 2009, Jonny Lamb <jonny at debian.org>
-License: GPLv2
+License: GPL-2
  On Debian systems the full text of the GNU General Public License can be found
  in the `/usr/share/common-licenses/GPL-2' file.

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