From 2af394dab95f17430c41fc364a45d0184211f29c Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 3 Aug 2010 11:07:23 +1000 Subject: [PATCH] freetype: clarify that the GPL licence is "version 2 or later", not just version 2. The FTL (Freetype Licence) is still available. This matches the original Freetype library (written in C). This only expands and does not further restrict the licensing options available to users of the freetype-go library. R=adg CC=golang-dev http://codereview.appspot.com/1731049 --- Makefile | 4 ++-- example/freetype/main.go | 4 ++-- example/gamma/main.go | 4 ++-- example/raster/main.go | 4 ++-- example/round/main.go | 4 ++-- example/truetype/main.go | 4 ++-- freetype/Makefile | 4 ++-- freetype/freetype.go | 4 ++-- freetype/raster/Makefile | 4 ++-- freetype/raster/geom.go | 4 ++-- freetype/raster/paint.go | 4 ++-- freetype/raster/raster.go | 4 ++-- freetype/truetype/Makefile | 4 ++-- freetype/truetype/truetype.go | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 88536b2..4727f40 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Copyright 2010 The Freetype-Go Authors. All rights reserved. # Use of this source code is governed by your choice of either the -# FreeType License or the GNU General Public License version 2, -# both of which can be found in the LICENSE file. +# FreeType License or the GNU General Public License version 2 (or +# any later version), both of which can be found in the LICENSE file. include $(GOROOT)/src/Make.$(GOARCH) diff --git a/example/freetype/main.go b/example/freetype/main.go index 012591e..f28d3cd 100644 --- a/example/freetype/main.go +++ b/example/freetype/main.go @@ -1,7 +1,7 @@ // Copyright 2010 The Freetype-Go Authors. All rights reserved. // Use of this source code is governed by your choice of either the -// FreeType License or the GNU General Public License version 2, -// both of which can be found in the LICENSE file. +// FreeType License or the GNU General Public License version 2 (or +// any later version), both of which can be found in the LICENSE file. package main diff --git a/example/gamma/main.go b/example/gamma/main.go index 6c0d875..a86cd45 100644 --- a/example/gamma/main.go +++ b/example/gamma/main.go @@ -1,7 +1,7 @@ // Copyright 2010 The Freetype-Go Authors. All rights reserved. // Use of this source code is governed by your choice of either the -// FreeType License or the GNU General Public License version 2, -// both of which can be found in the LICENSE file. +// FreeType License or the GNU General Public License version 2 (or +// any later version), both of which can be found in the LICENSE file. package main diff --git a/example/raster/main.go b/example/raster/main.go index f656c40..1506581 100644 --- a/example/raster/main.go +++ b/example/raster/main.go @@ -1,7 +1,7 @@ // Copyright 2010 The Freetype-Go Authors. All rights reserved. // Use of this source code is governed by your choice of either the -// FreeType License or the GNU General Public License version 2, -// both of which can be found in the LICENSE file. +// FreeType License or the GNU General Public License version 2 (or +// any later version), both of which can be found in the LICENSE file. package main diff --git a/example/round/main.go b/example/round/main.go index e77a13d..2e66eed 100644 --- a/example/round/main.go +++ b/example/round/main.go @@ -1,7 +1,7 @@ // Copyright 2010 The Freetype-Go Authors. All rights reserved. // Use of this source code is governed by your choice of either the -// FreeType License or the GNU General Public License version 2, -// both of which can be found in the LICENSE file. +// FreeType License or the GNU General Public License version 2 (or +// any later version), both of which can be found in the LICENSE file. // This program visualizes the quadratic approximation to the circle, used to // implement round joins when stroking paths. The approximation is used in the diff --git a/example/truetype/main.go b/example/truetype/main.go index 53ddada..c6cf935 100644 --- a/example/truetype/main.go +++ b/example/truetype/main.go @@ -1,7 +1,7 @@ // Copyright 2010 The Freetype-Go Authors. All rights reserved. // Use of this source code is governed by your choice of either the -// FreeType License or the GNU General Public License version 2, -// both of which can be found in the LICENSE file. +// FreeType License or the GNU General Public License version 2 (or +// any later version), both of which can be found in the LICENSE file. package main diff --git a/freetype/Makefile b/freetype/Makefile index 054cd3f..2981b78 100644 --- a/freetype/Makefile +++ b/freetype/Makefile @@ -1,7 +1,7 @@ # Copyright 2010 The Freetype-Go Authors. All rights reserved. # Use of this source code is governed by your choice of either the -# FreeType License or the GNU General Public License version 2, -# both of which can be found in the LICENSE file. +# FreeType License or the GNU General Public License version 2 (or +# any later version), both of which can be found in the LICENSE file. include $(GOROOT)/src/Make.$(GOARCH) diff --git a/freetype/freetype.go b/freetype/freetype.go index 31f95d6..4cda0b3 100644 --- a/freetype/freetype.go +++ b/freetype/freetype.go @@ -1,7 +1,7 @@ // Copyright 2010 The Freetype-Go Authors. All rights reserved. // Use of this source code is governed by your choice of either the -// FreeType License or the GNU General Public License version 2, -// both of which can be found in the LICENSE file. +// FreeType License or the GNU General Public License version 2 (or +// any later version), both of which can be found in the LICENSE file. // The freetype package provides a convenient API to draw text onto an image. // Use the freetype/raster and freetype/truetype packages for lower level diff --git a/freetype/raster/Makefile b/freetype/raster/Makefile index cf393ab..6f1fc96 100644 --- a/freetype/raster/Makefile +++ b/freetype/raster/Makefile @@ -1,7 +1,7 @@ # Copyright 2010 The Freetype-Go Authors. All rights reserved. # Use of this source code is governed by your choice of either the -# FreeType License or the GNU General Public License version 2, -# both of which can be found in the LICENSE file. +# FreeType License or the GNU General Public License version 2 (or +# any later version), both of which can be found in the LICENSE file. include $(GOROOT)/src/Make.$(GOARCH) diff --git a/freetype/raster/geom.go b/freetype/raster/geom.go index 0ddba81..87b89c5 100644 --- a/freetype/raster/geom.go +++ b/freetype/raster/geom.go @@ -1,7 +1,7 @@ // Copyright 2010 The Freetype-Go Authors. All rights reserved. // Use of this source code is governed by your choice of either the -// FreeType License or the GNU General Public License version 2, -// both of which can be found in the LICENSE file. +// FreeType License or the GNU General Public License version 2 (or +// any later version), both of which can be found in the LICENSE file. package raster diff --git a/freetype/raster/paint.go b/freetype/raster/paint.go index 4f89f62..beac34c 100644 --- a/freetype/raster/paint.go +++ b/freetype/raster/paint.go @@ -1,7 +1,7 @@ // Copyright 2010 The Freetype-Go Authors. All rights reserved. // Use of this source code is governed by your choice of either the -// FreeType License or the GNU General Public License version 2, -// both of which can be found in the LICENSE file. +// FreeType License or the GNU General Public License version 2 (or +// any later version), both of which can be found in the LICENSE file. package raster diff --git a/freetype/raster/raster.go b/freetype/raster/raster.go index 900e262..90b57b7 100644 --- a/freetype/raster/raster.go +++ b/freetype/raster/raster.go @@ -1,7 +1,7 @@ // Copyright 2010 The Freetype-Go Authors. All rights reserved. // Use of this source code is governed by your choice of either the -// FreeType License or the GNU General Public License version 2, -// both of which can be found in the LICENSE file. +// FreeType License or the GNU General Public License version 2 (or +// any later version), both of which can be found in the LICENSE file. // The raster package provides an anti-aliasing 2-D rasterizer. // diff --git a/freetype/truetype/Makefile b/freetype/truetype/Makefile index 4a8bcb6..eadcd7c 100644 --- a/freetype/truetype/Makefile +++ b/freetype/truetype/Makefile @@ -1,7 +1,7 @@ # Copyright 2010 The Freetype-Go Authors. All rights reserved. # Use of this source code is governed by your choice of either the -# FreeType License or the GNU General Public License version 2, -# both of which can be found in the LICENSE file. +# FreeType License or the GNU General Public License version 2 (or +# any later version), both of which can be found in the LICENSE file. include $(GOROOT)/src/Make.$(GOARCH) diff --git a/freetype/truetype/truetype.go b/freetype/truetype/truetype.go index 4df4490..d1eecde 100644 --- a/freetype/truetype/truetype.go +++ b/freetype/truetype/truetype.go @@ -1,7 +1,7 @@ // Copyright 2010 The Freetype-Go Authors. All rights reserved. // Use of this source code is governed by your choice of either the -// FreeType License or the GNU General Public License version 2, -// both of which can be found in the LICENSE file. +// FreeType License or the GNU General Public License version 2 (or +// any later version), both of which can be found in the LICENSE file. // The truetype package provides a parser for the TTF file format. That format // is documented at http://developer.apple.com/fonts/TTRefMan/ and