From 5c88d90ce8ebe80b85c84e0796227b557254e653 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 30 Jun 2015 10:59:49 -0500 Subject: [PATCH] [libpng15] Bump version to 1.5.23beta03 --- ANNOUNCE | 20 +++++++++++--------- CHANGES | 2 ++ CMakeLists.txt | 2 +- LICENSE | 2 +- README | 2 +- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.c | 6 +++--- 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/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 25 files changed, 70 insertions(+), 66 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index adc6b3e73..ac415e968 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.23beta02 - June 30, 2015 +Libpng 1.5.23beta03 - June 30, 2015 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. @@ -9,21 +9,21 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.23beta02.tar.xz (LZMA-compressed, recommended) - 1.5.23beta02.tar.gz - 1.5.23beta02.tar.bz2 + 1.5.23beta03.tar.xz (LZMA-compressed, recommended) + 1.5.23beta03.tar.gz + 1.5.23beta03.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1523b02.7z (LZMA-compressed, recommended) - lp1523b02.zip + lp1523b03.7z (LZMA-compressed, recommended) + lp1523b03.zip Other information: - 1.5.23beta02-README.txt - 1.5.23beta02-LICENSE.txt - libpng-1.5.23beta02-*.asc (armored detached GPG signatures) + 1.5.23beta03-README.txt + 1.5.23beta03-LICENSE.txt + libpng-1.5.23beta03-*.asc (armored detached GPG signatures) Changes since the last public release (1.5.22): @@ -47,6 +47,8 @@ Version 1.5.23beta02 [June 30, 2015] Quieted Coverity issues in pngvalid.c. Removed non-working progressive reader 'skip' function. +Version 1.5.23beta03 [June 30, 2015] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index a3e4ab8b4..b79ef0a9c 100644 --- a/CHANGES +++ b/CHANGES @@ -4359,6 +4359,8 @@ Version 1.5.23beta02 [June 30, 2015] Quieted Coverity issues in pngvalid.c. Removed non-working progressive reader 'skip' function. +Version 1.5.23beta03 [June 30, 2015] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CMakeLists.txt b/CMakeLists.txt index eb32cba0e..c92a5f2d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,7 +224,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.23beta02 +# VERSION 15.${PNGLIB_RELEASE}.1.5.23beta03 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 95dd243da..45613f157 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.23beta02, June 30, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.5.23beta03, June 30, 2015, are Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/README b/README index 07eb8c94b..22a407a5e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.23beta02 - June 30, 2015 (shared library 15.0) +README for libpng version 1.5.23beta03 - June 30, 2015 (shared library 15.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 b/configure index 77438bb72..a18b4546b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.5.23beta02. +# Generated by GNU Autoconf 2.69 for libpng 1.5.23beta03. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.23beta02' -PACKAGE_STRING='libpng 1.5.23beta02' +PACKAGE_VERSION='1.5.23beta03' +PACKAGE_STRING='libpng 1.5.23beta03' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpng 1.5.23beta02 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.23beta03 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.23beta02:";; + short | recursive ) echo "Configuration of libpng 1.5.23beta03:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.23beta02 +libpng configure 1.5.23beta03 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2002,7 +2002,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpng $as_me 1.5.23beta02, which was +It was created by libpng $as_me 1.5.23beta03, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2865,7 +2865,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.23beta02' + VERSION='1.5.23beta03' cat >>confdefs.h <<_ACEOF @@ -2982,7 +2982,7 @@ fi -PNGLIB_VERSION=1.5.23beta02 +PNGLIB_VERSION=1.5.23beta03 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=23 @@ -14124,7 +14124,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.5.23beta02, which was +This file was extended by libpng $as_me 1.5.23beta03, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14190,7 +14190,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.5.23beta02 +libpng config.status 1.5.23beta03 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d0abdb87d..782200928 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.23beta02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.23beta03], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE([1.13 serial-tests subdir-objects]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.23beta02 +PNGLIB_VERSION=1.5.23beta03 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=23 diff --git a/libpng-manual.txt b/libpng-manual.txt index 8707599c9..a4408d358 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.5.23beta02 - June 30, 2015 + libpng version 1.5.23beta03 - June 30, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.5.23beta02 - June 30, 2015 + libpng versions 0.97, January 1998, through 1.5.23beta03 - June 30, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4541,7 +4541,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.5.23beta02 are Y2K compliant. It is my belief that earlier +upward through 1.5.23beta03 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 6634e6233..d0ea284ab 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "June 30, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.23beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.23beta03 .SH SYNOPSIS \fB #include \fP @@ -492,7 +492,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.5.23beta02 - June 30, 2015 + libpng version 1.5.23beta03 - June 30, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.23beta02 - June 30, 2015 + libpng versions 0.97, January 1998, through 1.5.23beta03 - June 30, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5033,7 +5033,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.5.23beta02 are Y2K compliant. It is my belief that earlier +upward through 1.5.23beta03 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 @@ -5280,7 +5280,7 @@ the first widely used release: 1.5.22beta01-04 15 10522 15.so.15.22[.0] 1.5.22rc01-04 15 10522 15.so.15.22[.0] 1.5.22 15 10522 15.so.15.22[.0] - 1.5.23beta01 15 10523 15.so.15.23[.0] + 1.5.23beta01-03 15 10523 15.so.15.23[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5337,7 +5337,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.23beta02 - June 30, 2015: +Libpng version 1.5.23beta03 - June 30, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5360,7 +5360,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.23beta02, June 30, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.5.23beta03, June 30, 2015, are Copyright (c) 2004,2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors diff --git a/libpngpf.3 b/libpngpf.3 index 6580c9fe5..57dc80f5f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "June 30, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.23beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.23beta03 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 426c1e435..e37072b9a 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_23beta02 Your_png_h_is_not_version_1_5_23beta02; +typedef png_libpng_version_1_5_23beta03 Your_png_h_is_not_version_1_5_23beta03; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -648,13 +648,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.23beta02 - June 30, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.5.23beta03 - June 30, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.5.23beta02 - June 30, 2015\ + return "libpng version 1.5.23beta03 - June 30, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index f6525da51..1ea6336c2 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.23beta02, June 30, 2015 + * libpng version 1.5.23beta03, June 30, 2015 * * Copyright (c) 1998-2015 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.5.23beta02, June 30, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.5.23beta03, June 30, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -209,7 +209,7 @@ * 1.5.22beta01-04 15 10522 15.so.15.22[.0] * 1.5.22rc01-04 15 10522 15.so.15.22[.0] * 1.5.22 15 10522 15.so.15.22[.0] - * 1.5.23beta01-02 15 10523 15.so.15.23[.0] + * 1.5.23beta01-03 15 10523 15.so.15.23[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -241,7 +241,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.23beta02, June 30, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.23beta03, June 30, 2015, are * Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -359,7 +359,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.23beta02 are Y2K compliant. It is my belief that + * upward through 1.5.23beta03 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 @@ -420,9 +420,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.23beta02" +#define PNG_LIBPNG_VER_STRING "1.5.23beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.23beta02 - June 30, 2015\n" + " libpng version 1.5.23beta03 - June 30, 2015\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -436,7 +436,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 03 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -583,7 +583,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_5_23beta02; +typedef char* png_libpng_version_1_5_23beta03; /* Three color definitions. The order of the red, green, and blue, (and the * exact size) is not important, although the size of the fields need to diff --git a/pngconf.h b/pngconf.h index e7752e684..1c799994a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.23beta02, June 30, 2015 + * libpng version 1.5.23beta03, June 30, 2015 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 9e33e7652..4338a9bde 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2025,4 +2025,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_23beta02 Your_png_h_is_not_version_1_5_23beta02; +typedef png_libpng_version_1_5_23beta03 Your_png_h_is_not_version_1_5_23beta03; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index b7382c8d8..d56005077 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.23beta02 - June 30, 2015 +libpng version 1.5.23beta03 - June 30, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1fc357062..b71c3837b 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@