[devel] Revise references to zlib/libpng license
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index c0e92e8..5b4575a 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt
@@ -4,7 +4,7 @@ # Copyright (C) 2007 Glenn Randers-Pehrson # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h set(PNGLIB_MAJOR 1)
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index e3d862a..ab88c47 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in
@@ -6,7 +6,7 @@ # Copyright (C) 2002 Glenn Randers-Pehrson # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Modeled after libxml-config.
diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in index dbeef82..97028f0 100755 --- a/scripts/libpng-config.in +++ b/scripts/libpng-config.in
@@ -6,7 +6,7 @@ # Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Modeled after libxml-config.
diff --git a/scripts/libpng.icc b/scripts/libpng.icc index ce8180e..f6f5e2e 100644 --- a/scripts/libpng.icc +++ b/scripts/libpng.icc
@@ -3,7 +3,7 @@ // Copyright (C) 2000 Cosmin Truta // // This code is released under the zlib/libpng license. -// For conditions of distribution and use, see copyright notice, disclaimer, +// For conditions of distribution and use, see the disclaimer // and license in png.h // // Notes: @@ -11,7 +11,6 @@ // Tested with IBM VAC++ 4.0 under Win32 // Expected to work with IBM VAC++ 4.0 or later under OS/2 and Win32 // Can be easily adapted for IBM VAC++ 4.0 or later under AIX -// For conditions of distribution and use, see copyright notice in png.h option incl(searchpath, "../zlib"), opt(level, "2"), link(libsearchpath, "../zlib")
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 7102a41..e350cf1 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu
@@ -5,7 +5,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 3fb1779..0d75d50 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu
@@ -5,7 +5,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 874c4ae..fd3f460 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix
@@ -5,7 +5,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Location of the zlib library and include files
diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga index 32d98a4..1098676 100644 --- a/scripts/makefile.amiga +++ b/scripts/makefile.amiga
@@ -3,7 +3,7 @@ # Copyright (C) 1995-2000 Wolf Faust # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # # Note: Use #define PNG_READ_BIG_ENDIAN_SUPPORTED in pngconf.h
diff --git a/scripts/makefile.atari b/scripts/makefile.atari index 3b771b5..e181008 100644 --- a/scripts/makefile.atari +++ b/scripts/makefile.atari
@@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # # modified for LC56/ATARI assumes libz.lib is in same dir and uses default
diff --git a/scripts/makefile.beos b/scripts/makefile.beos index af2cbd2..55affd6 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos
@@ -5,7 +5,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 6e45dec..343db68 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin
@@ -9,7 +9,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # This makefile intends to support building outside the src directory
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index b258c0a..918d59a 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin
@@ -6,7 +6,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # where "make install" puts libpng.a, libpng14.dylib, png.h and pngconf.h
diff --git a/scripts/makefile.dec b/scripts/makefile.dec index b779687..3e33158 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec
@@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2 index e0c6157..a99449b 100644 --- a/scripts/makefile.dj2 +++ b/scripts/makefile.dj2
@@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # where make install will put libpng.a and png.h
diff --git a/scripts/makefile.elf b/scripts/makefile.elf index d02a001..5843d2e 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf
@@ -4,7 +4,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Modified for Debian by Junichi Uekawa and Josselin Mouette
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index 6ba1dec..362a750 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd
@@ -2,7 +2,7 @@ # Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h PREFIX?= /usr/local
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index 7e05743..66af3b8 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc
@@ -4,7 +4,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Location of the zlib library and include files
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 2c96ff2..fa78346 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64
@@ -4,7 +4,7 @@ # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Where the zlib library and include files are located
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 09eeeb3..b8b087e 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc
@@ -5,7 +5,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index df53d33..13f31e0 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux
@@ -4,7 +4,7 @@ # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Where the zlib library and include files are located
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc index 89bbac4..13d4c50 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc
@@ -4,7 +4,7 @@ # Copyright (C) 2000 Cosmin Truta # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # # Notes:
diff --git a/scripts/makefile.intel b/scripts/makefile.intel index 61c843e..6015d39 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel
@@ -6,7 +6,7 @@ # copyright 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # # To use, do "nmake /f scripts\makefile.intel"
diff --git a/scripts/makefile.knr b/scripts/makefile.knr index 26dc2e9..b69ae50 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr
@@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # # This makefile requires the file ansi2knr.c, which you can get
diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 6dbdc40..cdc5216 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux
@@ -4,7 +4,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 90d2255..fb08f17 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw
@@ -9,7 +9,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Built from makefile.cygwin
diff --git a/scripts/makefile.mips b/scripts/makefile.mips index 036b6fa..540e745 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips
@@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # where make install puts libpng.a and png.h
diff --git a/scripts/makefile.msc b/scripts/makefile.msc index 1abb38c..3203ebd 100644 --- a/scripts/makefile.msc +++ b/scripts/makefile.msc
@@ -3,7 +3,7 @@ # Copyright (C) 2006, 2009 Glenn Randers-Pehrson # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 5738f1c..260be3a 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd
@@ -5,7 +5,7 @@ # Copyright (C) 2007, 2009 Glenn Randers-Pehrson # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # You should also run makefile.netbsd
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 8c1277a..bb4e445 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd
@@ -5,7 +5,7 @@ # Copyright (C) 2007, 2009 Glenn Randers-Pehrson # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # You should also run makefile.ne0bsd
diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index d0f788b..3e89684 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx
@@ -4,7 +4,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 60901ff..f5dc4f5 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd
@@ -3,7 +3,7 @@ # Copyright (C) 2007-2008 Glenn Randers-Pehrson # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h PREFIX?= /usr/local
diff --git a/scripts/makefile.os2 b/scripts/makefile.os2 index a572011..5ee40b2 100644 --- a/scripts/makefile.os2 +++ b/scripts/makefile.os2
@@ -1,7 +1,7 @@ # makefile for libpng on OS/2 with gcc # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Related files: pngos2.def
diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 62d9399..a41198a 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco
@@ -6,7 +6,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index b90c46e..c3f5538 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc
@@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 5fc1a7f..f212e51 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi
@@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index b1b13a3..f8248f2 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9
@@ -6,7 +6,7 @@ # Copyright (C) 1996-1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index eca9c60..d87caa5 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris
@@ -5,7 +5,7 @@ # Copyright (C) 1996, 1997 Andreas Dilger # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # Library name:
diff --git a/scripts/makefile.std b/scripts/makefile.std index 7d0995b..3d03168 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std
@@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # where make install puts libpng.a and png.h
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index f5cb58d..2ec7cdf 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos
@@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # where make install puts libpng.a and png.h
diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32 index 8fe3d14..8639829 100644 --- a/scripts/makefile.vcawin32 +++ b/scripts/makefile.vcawin32
@@ -3,7 +3,7 @@ # Copyright (C) 1998 Tim Wegner # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index 71f1f15..dc688f6 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32
@@ -3,7 +3,7 @@ # Copyright (C) 2006,2009 Glenn Randers-Pehrson # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom index b4542c9..ba69391 100644 --- a/scripts/makefile.watcom +++ b/scripts/makefile.watcom
@@ -5,7 +5,7 @@ # copyright 1995 Guy Eric Schalnat, Group 42, Inc. # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h # To use, do "wmake /f scripts\makefile.watcom"
diff --git a/scripts/smakefile.ppc b/scripts/smakefile.ppc index f89ec87..58292dd 100644 --- a/scripts/smakefile.ppc +++ b/scripts/smakefile.ppc
@@ -3,7 +3,7 @@ # Copyright (C) 1998 by Andreas R. Kleinert # # This code is released under the zlib/libpng license. -# For conditions of distribution and use, see copyright notice, disclaimer, +# For conditions of distribution and use, see the disclaimer # and license in png.h CC = scppc