[pkg-java] r18632 - trunk/commons-math3/debian

[Tony Mancill]

Author: tmancill
Date: 2015-01-04 17:55:46 +0000 (Sun, 04 Jan 2015)
New Revision: 18632

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

Modified: trunk/commons-math3/debian/changelog
===================================================================
--- trunk/commons-math3/debian/changelog	2014-12-24 13:34:12 UTC (rev 18631)
+++ trunk/commons-math3/debian/changelog	2015-01-04 17:55:46 UTC (rev 18632)
@@ -1,3 +1,11 @@
+commons-math3 (3.3-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Address lintian warning: pipe-symbol-used-as-license-disjunction
+    in debian/copyright.
+
+ -- tony mancill <tmancill at debian.org>  Sun, 04 Jan 2015 09:54:53 -0800
+
 commons-math3 (3.3-1) unstable; urgency=medium
 
   * New upstream release

Modified: trunk/commons-math3/debian/copyright
===================================================================
--- trunk/commons-math3/debian/copyright	2014-12-24 13:34:12 UTC (rev 18631)
+++ trunk/commons-math3/debian/copyright	2015-01-04 17:55:46 UTC (rev 18632)
@@ -28,7 +28,7 @@
 
 Files: src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegrator.java
 Copyright: 2004, Ernst Hairer
-License: Apache-2.0 | other
+License: Apache-2.0 or other
   This implementation is basically a reimplementation in Java of the
   <http://www.unige.ch/math/folks/hairer/prog/nonstiff/odex.f>
   fortran code by E. Hairer and G. Wanner. The redistribution policy
@@ -69,7 +69,7 @@
   src/test/java/org/apache/commons/math3/optimization/general/MinpackTest.java
   src/test/java/org/apache/commons/math3/optimization/general/NonLinearConjugateGradientOptimizerTest.java
 Copyright: 1999, University of Chicago
-License: Apache-2.0 | other
+License: Apache-2.0 or other
   On Debian GNU/Linux system you can find the complete text of the
   Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
   .
@@ -140,7 +140,7 @@
 Files: src/main/java/org/apache/commons/math3/linear/EigenDecompositionImpl.java
 Comment: This class includes software translated from some LAPACK Fortran routines.
 Copyright: 1992-2008, The University of Tennessee
-License: Apache-2.0 | other
+License: Apache-2.0 or other
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -174,7 +174,7 @@
  version of the Mersenne-Twister generator written in C by Makoto Matsumoto
  and Takuji Nishimura.
 Copyright: 1997-2002, Makoto Matsumoto and Takuji Nishimura
-License: Apache-2.0 | other
+License: Apache-2.0 or other
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met: