From 3dfc826c5145408bc2362c1b0300ee2b64d2ae35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 10 Oct 2011 14:04:01 +0000 Subject: [PATCH] LGPLv2.1 -> LGPLv3 for ImageIO --- CGALimageIO/include/CGAL/ImageIO.h | 3 +-- CGALimageIO/include/CGAL/ImageIO/export.h | 4 ++-- CGALimageIO/include/CGAL/Image_3.h | 4 ++-- CGALimageIO/include/CGAL/Image_3_vtk_interface.h | 4 ++-- CGALimageIO/src/CGALImageIO/ImageIO.cpp | 2 +- CGALimageIO/src/CGALImageIO/Image_3.cpp | 4 ++-- CGALimageIO/src/CGALImageIO/LICENSE | 3 +-- CGALimageIO/src/CGALImageIO/analyze.cpp | 3 +-- CGALimageIO/src/CGALImageIO/analyze.h | 3 +-- CGALimageIO/src/CGALImageIO/bmp.cpp | 3 +-- CGALimageIO/src/CGALImageIO/bmp.h | 3 +-- CGALimageIO/src/CGALImageIO/bmpendian.cpp | 3 +-- CGALimageIO/src/CGALImageIO/bmpendian.h | 3 +-- CGALimageIO/src/CGALImageIO/bmpread.cpp | 3 +-- CGALimageIO/src/CGALImageIO/bmpread.h | 3 +-- CGALimageIO/src/CGALImageIO/bmptypes.h | 3 +-- CGALimageIO/src/CGALImageIO/convert.cpp | 3 +-- CGALimageIO/src/CGALImageIO/convert.h | 3 +-- CGALimageIO/src/CGALImageIO/fgetns.cpp | 3 +-- CGALimageIO/src/CGALImageIO/fgetns.h | 3 +-- CGALimageIO/src/CGALImageIO/gif.cpp | 3 +-- CGALimageIO/src/CGALImageIO/gif.h | 3 +-- CGALimageIO/src/CGALImageIO/gis.cpp | 3 +-- CGALimageIO/src/CGALImageIO/gis.h | 3 +-- CGALimageIO/src/CGALImageIO/inr.cpp | 3 +-- CGALimageIO/src/CGALImageIO/inr.h | 3 +-- CGALimageIO/src/CGALImageIO/iris.cpp | 3 +-- CGALimageIO/src/CGALImageIO/iris.h | 3 +-- CGALimageIO/src/CGALImageIO/mincio.cpp | 3 +-- CGALimageIO/src/CGALImageIO/mincio.h | 3 +-- CGALimageIO/src/CGALImageIO/pnm.cpp | 3 +-- CGALimageIO/src/CGALImageIO/pnm.h | 3 +-- CGALimageIO/src/CGALImageIO/recbuffer.cpp | 3 +-- CGALimageIO/src/CGALImageIO/recbuffer.h | 3 +-- CGALimageIO/src/CGALImageIO/recline.cpp | 3 +-- CGALimageIO/src/CGALImageIO/recline.h | 3 +-- CGALimageIO/src/CGALImageIO/reech4x4.cpp | 3 +-- CGALimageIO/src/CGALImageIO/reech4x4.h | 3 +-- CGALimageIO/src/CGALImageIO/typedefs.h | 3 +-- Maintenance/deb/sid/debian/copyright | 2 +- Maintenance/deb/squeeze/debian/copyright | 2 +- Maintenance/deb/wheezy/debian/copyright | 2 +- 42 files changed, 46 insertions(+), 80 deletions(-) diff --git a/CGALimageIO/include/CGAL/ImageIO.h b/CGALimageIO/include/CGAL/ImageIO.h index ef58411395c..7aaa654fba8 100644 --- a/CGALimageIO/include/CGAL/ImageIO.h +++ b/CGALimageIO/include/CGAL/ImageIO.h @@ -6,8 +6,7 @@ // The files in this directory are part of the ImageIO Library. // You can redistribute them and/or modify them under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/include/CGAL/ImageIO/export.h b/CGALimageIO/include/CGAL/ImageIO/export.h index 65f7013e940..c9f4667691b 100755 --- a/CGALimageIO/include/CGAL/ImageIO/export.h +++ b/CGALimageIO/include/CGAL/ImageIO/export.h @@ -2,8 +2,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/include/CGAL/Image_3.h b/CGALimageIO/include/CGAL/Image_3.h index 696291819b8..38096f79540 100644 --- a/CGALimageIO/include/CGAL/Image_3.h +++ b/CGALimageIO/include/CGAL/Image_3.h @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/include/CGAL/Image_3_vtk_interface.h b/CGALimageIO/include/CGAL/Image_3_vtk_interface.h index ad74fdf9c43..9f8501f663f 100644 --- a/CGALimageIO/include/CGAL/Image_3_vtk_interface.h +++ b/CGALimageIO/include/CGAL/Image_3_vtk_interface.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/ImageIO.cpp b/CGALimageIO/src/CGALImageIO/ImageIO.cpp index c9e79f601c7..9cb03d3f8e1 100644 --- a/CGALimageIO/src/CGALImageIO/ImageIO.cpp +++ b/CGALimageIO/src/CGALImageIO/ImageIO.cpp @@ -6,7 +6,7 @@ // The files in this directory are part of the ImageIO Library. // You can redistribute them and/or modify them under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. See the file /usr/share/common-licenses/LGPL-2.1. +// version 3 of the License. See the file /usr/share/common-licenses/LGPL-3. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/Image_3.cpp b/CGALimageIO/src/CGALImageIO/Image_3.cpp index c1f4b86a97d..f0f5e028903 100644 --- a/CGALimageIO/src/CGALImageIO/Image_3.cpp +++ b/CGALimageIO/src/CGALImageIO/Image_3.cpp @@ -4,8 +4,8 @@ // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// published by the Free Software Foundation; either version 3 of the License, +// or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/LICENSE b/CGALimageIO/src/CGALImageIO/LICENSE index 179cbe259cf..08d4e2694b8 100644 --- a/CGALimageIO/src/CGALImageIO/LICENSE +++ b/CGALimageIO/src/CGALImageIO/LICENSE @@ -4,8 +4,7 @@ // The files in this directory are part of the ImageIO Library. // You can redistribute them and/or modify them under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/analyze.cpp b/CGALimageIO/src/CGALImageIO/analyze.cpp index 7fb642d0b00..16039da055c 100644 --- a/CGALimageIO/src/CGALImageIO/analyze.cpp +++ b/CGALimageIO/src/CGALImageIO/analyze.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/analyze.h b/CGALimageIO/src/CGALImageIO/analyze.h index 10b336afc8d..3132f67a2d5 100644 --- a/CGALimageIO/src/CGALImageIO/analyze.h +++ b/CGALimageIO/src/CGALImageIO/analyze.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmp.cpp b/CGALimageIO/src/CGALImageIO/bmp.cpp index f4b405384e8..a30035d2e50 100644 --- a/CGALimageIO/src/CGALImageIO/bmp.cpp +++ b/CGALimageIO/src/CGALImageIO/bmp.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmp.h b/CGALimageIO/src/CGALImageIO/bmp.h index 3ee7edee401..b3f1af20029 100644 --- a/CGALimageIO/src/CGALImageIO/bmp.h +++ b/CGALimageIO/src/CGALImageIO/bmp.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmpendian.cpp b/CGALimageIO/src/CGALImageIO/bmpendian.cpp index ee599129cda..64c8bc33f67 100644 --- a/CGALimageIO/src/CGALImageIO/bmpendian.cpp +++ b/CGALimageIO/src/CGALImageIO/bmpendian.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmpendian.h b/CGALimageIO/src/CGALImageIO/bmpendian.h index 993db4ac4a7..1ec25a0360d 100644 --- a/CGALimageIO/src/CGALImageIO/bmpendian.h +++ b/CGALimageIO/src/CGALImageIO/bmpendian.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmpread.cpp b/CGALimageIO/src/CGALImageIO/bmpread.cpp index 034c4626b84..ce6954274de 100644 --- a/CGALimageIO/src/CGALImageIO/bmpread.cpp +++ b/CGALimageIO/src/CGALImageIO/bmpread.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmpread.h b/CGALimageIO/src/CGALImageIO/bmpread.h index dc00db8a229..79798d90786 100644 --- a/CGALimageIO/src/CGALImageIO/bmpread.h +++ b/CGALimageIO/src/CGALImageIO/bmpread.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/bmptypes.h b/CGALimageIO/src/CGALImageIO/bmptypes.h index 201c3bf13ac..ed717f41b67 100644 --- a/CGALimageIO/src/CGALImageIO/bmptypes.h +++ b/CGALimageIO/src/CGALImageIO/bmptypes.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/convert.cpp b/CGALimageIO/src/CGALImageIO/convert.cpp index c7c09c097b8..9c2d52e5663 100644 --- a/CGALimageIO/src/CGALImageIO/convert.cpp +++ b/CGALimageIO/src/CGALImageIO/convert.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/convert.h b/CGALimageIO/src/CGALImageIO/convert.h index 8c3b0570223..1fd092a102e 100644 --- a/CGALimageIO/src/CGALImageIO/convert.h +++ b/CGALimageIO/src/CGALImageIO/convert.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/fgetns.cpp b/CGALimageIO/src/CGALImageIO/fgetns.cpp index ea603e35fd9..423cd37557c 100644 --- a/CGALimageIO/src/CGALImageIO/fgetns.cpp +++ b/CGALimageIO/src/CGALImageIO/fgetns.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/fgetns.h b/CGALimageIO/src/CGALImageIO/fgetns.h index c7ffb38fbae..9195d30f6ee 100644 --- a/CGALimageIO/src/CGALImageIO/fgetns.h +++ b/CGALimageIO/src/CGALImageIO/fgetns.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/gif.cpp b/CGALimageIO/src/CGALImageIO/gif.cpp index 9d8a9634f1f..e40a16cd5d4 100644 --- a/CGALimageIO/src/CGALImageIO/gif.cpp +++ b/CGALimageIO/src/CGALImageIO/gif.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/gif.h b/CGALimageIO/src/CGALImageIO/gif.h index 9b80f3d9f1d..ac2bf860f0d 100644 --- a/CGALimageIO/src/CGALImageIO/gif.h +++ b/CGALimageIO/src/CGALImageIO/gif.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/gis.cpp b/CGALimageIO/src/CGALImageIO/gis.cpp index 55d08a227fa..8755e8e361e 100644 --- a/CGALimageIO/src/CGALImageIO/gis.cpp +++ b/CGALimageIO/src/CGALImageIO/gis.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/gis.h b/CGALimageIO/src/CGALImageIO/gis.h index b9496fa5df8..4ddfddc9406 100644 --- a/CGALimageIO/src/CGALImageIO/gis.h +++ b/CGALimageIO/src/CGALImageIO/gis.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/inr.cpp b/CGALimageIO/src/CGALImageIO/inr.cpp index 11175d5c7bf..8dbba04586f 100644 --- a/CGALimageIO/src/CGALImageIO/inr.cpp +++ b/CGALimageIO/src/CGALImageIO/inr.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/inr.h b/CGALimageIO/src/CGALImageIO/inr.h index 4ab22e2aeaa..c6df6531335 100644 --- a/CGALimageIO/src/CGALImageIO/inr.h +++ b/CGALimageIO/src/CGALImageIO/inr.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/iris.cpp b/CGALimageIO/src/CGALImageIO/iris.cpp index e97c61d6292..1c0affca4d3 100644 --- a/CGALimageIO/src/CGALImageIO/iris.cpp +++ b/CGALimageIO/src/CGALImageIO/iris.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/iris.h b/CGALimageIO/src/CGALImageIO/iris.h index 52db0bf3e79..09ba2509956 100644 --- a/CGALimageIO/src/CGALImageIO/iris.h +++ b/CGALimageIO/src/CGALImageIO/iris.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/mincio.cpp b/CGALimageIO/src/CGALImageIO/mincio.cpp index 6c766e4c05a..ea7ca0c4d66 100644 --- a/CGALimageIO/src/CGALImageIO/mincio.cpp +++ b/CGALimageIO/src/CGALImageIO/mincio.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/mincio.h b/CGALimageIO/src/CGALImageIO/mincio.h index 83f044ce488..c067ffae088 100644 --- a/CGALimageIO/src/CGALImageIO/mincio.h +++ b/CGALimageIO/src/CGALImageIO/mincio.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/pnm.cpp b/CGALimageIO/src/CGALImageIO/pnm.cpp index 4fbcbf8fdb4..2ab1780a2bd 100644 --- a/CGALimageIO/src/CGALImageIO/pnm.cpp +++ b/CGALimageIO/src/CGALImageIO/pnm.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/pnm.h b/CGALimageIO/src/CGALImageIO/pnm.h index 1d7448e166c..03ebdd1a70d 100644 --- a/CGALimageIO/src/CGALImageIO/pnm.h +++ b/CGALimageIO/src/CGALImageIO/pnm.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/recbuffer.cpp b/CGALimageIO/src/CGALImageIO/recbuffer.cpp index e0630aeffd3..2798a5c5784 100644 --- a/CGALimageIO/src/CGALImageIO/recbuffer.cpp +++ b/CGALimageIO/src/CGALImageIO/recbuffer.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/recbuffer.h b/CGALimageIO/src/CGALImageIO/recbuffer.h index d4bb5c33add..f283227e50e 100644 --- a/CGALimageIO/src/CGALImageIO/recbuffer.h +++ b/CGALimageIO/src/CGALImageIO/recbuffer.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/recline.cpp b/CGALimageIO/src/CGALImageIO/recline.cpp index 840cf08748a..29dfa9b5635 100644 --- a/CGALimageIO/src/CGALImageIO/recline.cpp +++ b/CGALimageIO/src/CGALImageIO/recline.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/recline.h b/CGALimageIO/src/CGALImageIO/recline.h index 4a5bb7d30fd..78f869a5224 100644 --- a/CGALimageIO/src/CGALImageIO/recline.h +++ b/CGALimageIO/src/CGALImageIO/recline.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/reech4x4.cpp b/CGALimageIO/src/CGALImageIO/reech4x4.cpp index 9e5b4efead3..ffe6c8a07d4 100644 --- a/CGALimageIO/src/CGALImageIO/reech4x4.cpp +++ b/CGALimageIO/src/CGALImageIO/reech4x4.cpp @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/reech4x4.h b/CGALimageIO/src/CGALImageIO/reech4x4.h index fa0486553a4..2e751d109bd 100644 --- a/CGALimageIO/src/CGALImageIO/reech4x4.h +++ b/CGALimageIO/src/CGALImageIO/reech4x4.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/CGALimageIO/src/CGALImageIO/typedefs.h b/CGALimageIO/src/CGALImageIO/typedefs.h index 06dc86fd59d..ff50abec6c6 100644 --- a/CGALimageIO/src/CGALImageIO/typedefs.h +++ b/CGALimageIO/src/CGALImageIO/typedefs.h @@ -5,8 +5,7 @@ // CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the // GNU Lesser General Public License as published by the Free Software Foundation; -// version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. +// version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Maintenance/deb/sid/debian/copyright b/Maintenance/deb/sid/debian/copyright index 9e4534a1264..9d0295b8ecf 100644 --- a/Maintenance/deb/sid/debian/copyright +++ b/Maintenance/deb/sid/debian/copyright @@ -299,7 +299,7 @@ src/CGALimageIO. The files in this directory are part of the ImageIO Library. You can redistribute them and/or modify them under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; - version 2.1 of the License. See the file /usr/share/common-licenses/LGPL-2.1. + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. diff --git a/Maintenance/deb/squeeze/debian/copyright b/Maintenance/deb/squeeze/debian/copyright index d20c1271fa3..9fc477c69da 100644 --- a/Maintenance/deb/squeeze/debian/copyright +++ b/Maintenance/deb/squeeze/debian/copyright @@ -299,7 +299,7 @@ src/CGALimageIO. The files in this directory are part of the ImageIO Library. You can redistribute them and/or modify them under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; - version 2.1 of the License. See the file /usr/share/common-licenses/LGPL-2.1. + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software. diff --git a/Maintenance/deb/wheezy/debian/copyright b/Maintenance/deb/wheezy/debian/copyright index b6cda7fe15d..3fabef4d23e 100644 --- a/Maintenance/deb/wheezy/debian/copyright +++ b/Maintenance/deb/wheezy/debian/copyright @@ -299,7 +299,7 @@ src/CGALimageIO. The files in this directory are part of the ImageIO Library. You can redistribute them and/or modify them under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; - version 2.1 of the License. See the file /usr/share/common-licenses/LGPL-2.1. + either version 3 of the License, or (at your option) any later version. Licensees holding a valid commercial license may use this file in accordance with the commercial license agreement provided with the software.