From 436ce2c6e9e1b729152cfd69f7646395067d8db1 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 16 Oct 2016 14:05:39 -0500 Subject: [PATCH] [libpng16] Bump version to 1.6.26rc02 --- ANNOUNCE | 18 +++++++++--------- CHANGES | 2 +- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- contrib/examples/README.txt | 2 +- contrib/gregbook/README | 2 +- contrib/gregbook/rpng-win.c | 2 +- contrib/gregbook/rpng2-win.c | 2 +- contrib/pngminus/README | 2 +- contrib/pngminus/png2pnm.c | 2 +- contrib/pngminus/pnm2png.c | 2 +- contrib/pngsuite/README | 2 +- contrib/tools/README.txt | 3 ++- libpng-manual.txt | 6 +++--- libpng.3 | 16 ++++++++-------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.h | 18 +++++++++--------- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- scripts/def.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/makefile.sco | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 34 files changed, 68 insertions(+), 67 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index d91716feb..1d21ecfac 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.26rc01 - October 12, 2016 +Libpng 1.6.26rc02 - October 16, 2016 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.26rc01.tar.xz (LZMA-compressed, recommended) - 1.6.26rc01.tar.gz + 1.6.26rc02.tar.xz (LZMA-compressed, recommended) + 1.6.26rc02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1626r01.7z (LZMA-compressed, recommended) - lp1626r01.zip + lp1626r02.7z (LZMA-compressed, recommended) + lp1626r02.zip Other information: - 1.6.26rc01-README.txt - 1.6.26rc01-LICENSE.txt - libpng-1.6.26rc01-*.asc (armored detached GPG signatures) + 1.6.26rc02-README.txt + 1.6.26rc02-LICENSE.txt + libpng-1.6.26rc02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.25): @@ -69,7 +69,7 @@ Version 1.6.26beta06 [October 7, 2016] Use zlib-1.2.8.1 inflateValidate() instead of inflateReset2() to optionally avoid ADLER32 evaluation. -Version 1.6.26rc01 [October 12, 2016] +Version 1.6.26rc01 [October 16, 2016] No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index 93f79372d..4ac9f2076 100644 --- a/CHANGES +++ b/CHANGES @@ -5747,7 +5747,7 @@ Version 1.6.26beta06 [October 7, 2016] Use zlib-1.2.8.1 inflateValidate() instead of inflateReset2() to optionally avoid ADLER32 evaluation. -Version 1.6.26rc01 [October 12, 2016] +Version 1.6.26rc01 [October 16, 2016] No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CMakeLists.txt b/CMakeLists.txt index bfa6efc6b..7f831c213 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -696,7 +696,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.26rc01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.26rc02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 490081035..820da2c5b 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.26rc01, October 12, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.26rc02, October 16, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 12, 2016 +October 16, 2016 diff --git a/README b/README index c706ae2ff..be1cf775e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.26rc01 - October 12, 2016 (shared library 16.0) +README for libpng version 1.6.26rc02 - October 16, 2016 (shared library 16.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/configure.ac b/configure.ac index 1ce6a2a27..8f9a40e54 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.26rc01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.26rc02],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,7 +46,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.26rc01 +PNGLIB_VERSION=1.6.26rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=26 diff --git a/contrib/examples/README.txt b/contrib/examples/README.txt index 0525c9d36..48dab4f0f 100644 --- a/contrib/examples/README.txt +++ b/contrib/examples/README.txt @@ -21,4 +21,4 @@ ORIGINAL AUTHORS of the people below claim any rights with regard to the contents of this directory. - John Bowler + John Bowler diff --git a/contrib/gregbook/README b/contrib/gregbook/README index 7b1f6a3ea..fd30f0581 100644 --- a/contrib/gregbook/README +++ b/contrib/gregbook/README @@ -15,7 +15,7 @@ of PBMPLUS/NetPBM) and converts them to PNG. The source code for all three demo programs currently compiles under Unix, OpenVMS, and 32-bit Windows. (Special thanks to Martin Zinser, -zinser@decus.de, for making the necessary changes for OpenVMS and for +zinser at decus.de, for making the necessary changes for OpenVMS and for providing an appropriate build script.) Build instructions can be found below. diff --git a/contrib/gregbook/rpng-win.c b/contrib/gregbook/rpng-win.c index f53ddc8ec..cd5543937 100644 --- a/contrib/gregbook/rpng-win.c +++ b/contrib/gregbook/rpng-win.c @@ -182,7 +182,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode) #ifndef __CYGWIN__ /* First reenable console output, which normally goes to the bit bucket * for windowed apps. Closing the console window will terminate the - * app. Thanks to David.Geldreich@realviz.com for supplying the magical + * app. Thanks to David.Geldreich at realviz.com for supplying the magical * incantation. */ AllocConsole(); diff --git a/contrib/gregbook/rpng2-win.c b/contrib/gregbook/rpng2-win.c index a7b9dfaaf..c924c1c6c 100644 --- a/contrib/gregbook/rpng2-win.c +++ b/contrib/gregbook/rpng2-win.c @@ -301,7 +301,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, PSTR cmd, int showmode) #ifndef __CYGWIN__ /* Next reenable console output, which normally goes to the bit bucket * for windowed apps. Closing the console window will terminate the - * app. Thanks to David.Geldreich@realviz.com for supplying the magical + * app. Thanks to David.Geldreich at realviz.com for supplying the magical * incantation. */ AllocConsole(); diff --git a/contrib/pngminus/README b/contrib/pngminus/README index bbe7407ec..fbcfc9861 100644 --- a/contrib/pngminus/README +++ b/contrib/pngminus/README @@ -146,7 +146,7 @@ The Turbo bug The end ------- Willem van Schaik -mailto:willem@schaik.com +mailto:willem at schaik.com http://www.schaik.com/png/ ------- Oct 1999 diff --git a/contrib/pngminus/png2pnm.c b/contrib/pngminus/png2pnm.c index f68d7ff72..995fddf37 100644 --- a/contrib/pngminus/png2pnm.c +++ b/contrib/pngminus/png2pnm.c @@ -1,6 +1,6 @@ /* * png2pnm.c --- conversion from PNG-file to PGM/PPM-file - * copyright (C) 1999 by Willem van Schaik + * copyright (C) 1999 by Willem van Schaik * * version 1.0 - 1999.10.15 - First version. * diff --git a/contrib/pngminus/pnm2png.c b/contrib/pngminus/pnm2png.c index 8fa64cd1f..5de828a74 100644 --- a/contrib/pngminus/pnm2png.c +++ b/contrib/pngminus/pnm2png.c @@ -1,6 +1,6 @@ /* * pnm2png.c --- conversion from PBM/PGM/PPM-file to PNG-file - * copyright (C) 1999 by Willem van Schaik + * copyright (C) 1999 by Willem van Schaik * * version 1.0 - 1999.10.15 - First version. * version 1.1 - 2015.07.29 - Fixed leaks (Glenn Randers-Pehrson) diff --git a/contrib/pngsuite/README b/contrib/pngsuite/README index a7fde8f36..53ba5c8f7 100644 --- a/contrib/pngsuite/README +++ b/contrib/pngsuite/README @@ -101,5 +101,5 @@ Testing basn6a16.png: PASS (1072 zero samples) libpng passes test Willem van Schaik - + October 1999 diff --git a/contrib/tools/README.txt b/contrib/tools/README.txt index 5ddae02ce..f53be6df9 100644 --- a/contrib/tools/README.txt +++ b/contrib/tools/README.txt @@ -23,4 +23,5 @@ ORIGINAL AUTHORS of the people below claim any rights with regard to the contents of this directory. - John Bowler + John Bowler + Glenn Randers-Pehrson diff --git a/libpng-manual.txt b/libpng-manual.txt index 6bb11af10..96b156b71 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.26rc01 - October 12, 2016 + libpng version 1.6.26rc02 - October 16, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.26rc01 - October 12, 2016 + libpng versions 0.97, January 1998, through 1.6.26rc02 - October 16, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5354,7 +5354,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.26rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.26rc02 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer diff --git a/libpng.3 b/libpng.3 index cae705b3a..4fbc4b07e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "October 12, 2016" +.TH LIBPNG 3 "October 16, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.26rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.26rc02 .SH SYNOPSIS \fB #include \fP @@ -510,7 +510,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.26rc01 - October 12, 2016 + libpng version 1.6.26rc02 - October 16, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.26rc01 - October 12, 2016 + libpng versions 0.97, January 1998, through 1.6.26rc02 - October 16, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5864,7 +5864,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.26rc01 are Y2K compliant. It is my belief that earlier +upward through 1.6.26rc02 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer @@ -6022,7 +6022,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.26rc01 - October 12, 2016: +Libpng version 1.6.26rc02 - October 16, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6047,7 +6047,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.26rc01, October 12, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.26rc02, October 16, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -6172,7 +6172,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 12, 2016 +October 16, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 658ec7fd5..0102a0d41 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "October 12, 2016" +.TH LIBPNGPF 3 "October 16, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.26rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.26rc02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index f5f96af15..607b5e6c5 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "October 12, 2016" +.TH PNG 5 "October 16, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.h b/png.h index 2aa29ee25..75ca88f0c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.26rc01, October 12, 2016 + * libpng version 1.6.26rc02, October 16, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.26rc01, October 12, 2016: + * libpng versions 0.97, January 1998, through 1.6.26rc02, October 16, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -29,7 +29,7 @@ * files that are distributed with libpng have other copyright owners and * are released under other open source licenses. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.26rc01, October 12, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.26rc02, October 16, 2016 are * Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -246,13 +246,13 @@ * Y2K compliance in libpng: * ========================= * - * October 12, 2016 + * October 16, 2016 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.26rc01 are Y2K compliant. It is my belief that + * upward through 1.6.26rc02 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -314,8 +314,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.26rc01" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.26rc01 - October 12, 2016\n" +#define PNG_LIBPNG_VER_STRING "1.6.26rc02" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.26rc02 - October 16, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -329,7 +329,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -464,7 +464,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_26rc01; +typedef char* png_libpng_version_1_6_26rc02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 0561554f1..397d29415 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.26rc01, October 12, 2016 + * libpng version 1.6.26rc02, October 16, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index e7b2a76fc..e0f026da2 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2083,4 +2083,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_26rc01 Your_png_h_is_not_version_1_6_26rc01; +typedef png_libpng_version_1_6_26rc02 Your_png_h_is_not_version_1_6_26rc02; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 7cac400ec..019045bdc 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.26rc01 - October 12, 2016 +libpng version 1.6.26rc02 - October 16, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1ca32bc77..f843fd96b 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@