[pkg-java] r18635 - trunk/java3d/debian

[Tony Mancill]

Author: tmancill
Date: 2015-01-04 18:11:47 +0000 (Sun, 04 Jan 2015)
New Revision: 18635

Modified:
   trunk/java3d/debian/changelog
   trunk/java3d/debian/copyright
Log:
address lintian warning: pipe-symbol-used-as-license-disjunction

Modified: trunk/java3d/debian/changelog
===================================================================
--- trunk/java3d/debian/changelog	2015-01-04 18:02:19 UTC (rev 18634)
+++ trunk/java3d/debian/changelog	2015-01-04 18:11:47 UTC (rev 18635)
@@ -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.

Modified: trunk/java3d/debian/copyright
===================================================================
--- trunk/java3d/debian/copyright	2015-01-04 18:02:19 UTC (rev 18634)
+++ trunk/java3d/debian/copyright	2015-01-04 18:11:47 UTC (rev 18635)
@@ -172,7 +172,7 @@
 
 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 @@
        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 @@
 
 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.