From 2fff8078dc4d10a6546d048644de455894310b28 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 24 Feb 2014 19:20:50 -0600 Subject: [PATCH] [libpng16] Bump version to 1.6.10beta04 --- ANNOUNCE | 18 ++++++++++-------- CHANGES | 2 ++ CMakeLists.txt | 2 +- LICENSE | 2 +- README | 2 +- 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 | 12 ++++++------ scripts/def.dfn | 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 +- 24 files changed, 59 insertions(+), 55 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 860907ea6..b28bd2a7a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.10beta03 - February 25, 2014 +Libpng 1.6.10beta04 - February 25, 2014 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,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.10beta03.tar.xz (LZMA-compressed, recommended) - 1.6.10beta03.tar.gz + 1.6.10beta04.tar.xz (LZMA-compressed, recommended) + 1.6.10beta04.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1610b03.7z (LZMA-compressed, recommended) - lp1610b03.zip + lp1610b04.7z (LZMA-compressed, recommended) + lp1610b04.zip Other information: - 1.6.10beta03-README.txt - 1.6.10beta03-LICENSE.txt - libpng-1.6.10beta03-*.asc (armored detached GPG signatures) + 1.6.10beta04-README.txt + 1.6.10beta04-LICENSE.txt + libpng-1.6.10beta04-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.9): @@ -86,6 +86,8 @@ Version 1.6.10beta03 [February 25, 2014] Moved some documentation from png.h to libpng.3 and libpng-manual.txt Minor editing of contrib/arm-neon/README and contrib/examples/*.c +Version 1.6.10beta04 [February 25, 2014] + 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 8f437148c..88bea6d3f 100644 --- a/CHANGES +++ b/CHANGES @@ -4860,6 +4860,8 @@ Version 1.6.10beta03 [February 25, 2014] Moved some documentation from png.h to libpng.3 and libpng-manual.txt Minor editing of contrib/arm-neon/README and contrib/examples/*.c +Version 1.6.10beta04 [February 25, 2014] + 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 a3be8df61..399de2a92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.10beta03 +# VERSION 16.${PNGLIB_RELEASE}.1.6.10beta04 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index b81ca9558..13978e177 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.6.10beta03, February 25, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.10beta04, February 25, 2014, are Copyright (c) 2004, 2006-2014 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 4b0f64c4f..61c77f730 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.10beta03 - February 25, 2014 (shared library 16.0) +README for libpng version 1.6.10beta04 - February 25, 2014 (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 adf0e64a7..b3083fe1d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.10beta03],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.10beta04],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,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.10beta03 +PNGLIB_VERSION=1.6.10beta04 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=10 diff --git a/libpng-manual.txt b/libpng-manual.txt index 304a1ab1d..ce4a0918f 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.10beta03 - February 25, 2014 + libpng version 1.6.10beta04 - February 25, 2014 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.6.10beta03 - February 25, 2014 + libpng versions 0.97, January 1998, through 1.6.10beta04 - February 25, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5420,7 +5420,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.10beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.10beta04 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 de246c25f..c7d085a29 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "February 25, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10beta04 .SH SYNOPSIS \fB #include \fP @@ -504,7 +504,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.10beta03 - February 25, 2014 + libpng version 1.6.10beta04 - February 25, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.10beta03 - February 25, 2014 + libpng versions 0.97, January 1998, through 1.6.10beta04 - February 25, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5925,7 +5925,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.10beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.10beta04 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 @@ -6156,7 +6156,7 @@ the first widely used release: 1.6.9beta01-04 16 10609 16.so.16.9[.0] 1.6.9rc01-02 16 10609 16.so.16.9[.0] 1.6.9 16 10609 16.so.16.9[.0] - 1.6.10beta01-03 16 10610 16.so.16.10[.0] + 1.6.10beta01-04 16 10610 16.so.16.10[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6213,7 +6213,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.10beta03 - February 25, 2014: +Libpng version 1.6.10beta04 - February 25, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6236,7 +6236,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.10beta03, February 25, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.10beta04, February 25, 2014, are Copyright (c) 2004,2006-2007 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 3062fd97c..3cb368906 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "February 25, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10beta04 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index fd7f27989..23119eb35 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_6_10beta03 Your_png_h_is_not_version_1_6_10beta03; +typedef png_libpng_version_1_6_10beta04 Your_png_h_is_not_version_1_6_10beta04; /* 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 @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.10beta03 - February 25, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.10beta04 - February 25, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.6.10beta03 - February 25, 2014\ + return "libpng version 1.6.10beta04 - February 25, 2014\ Copyright (c) 1998-2014 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 14258af78..d81e3e025 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.10beta03 - February 25, 2014 + * libpng version 1.6.10beta04 - February 25, 2014 * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,7 +11,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.6.10beta03 - February 25, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.10beta04 - February 25, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -192,7 +192,7 @@ * 1.6.9beta01-04 16 10609 16.so.16.9[.0] * 1.6.9rc01-02 16 10609 16.so.16.9[.0] * 1.6.9 16 10609 16.so.16.9[.0] - * 1.6.10beta01-03 16 10610 16.so.16.10[.0] + * 1.6.10beta01-04 16 10610 16.so.16.10[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -224,7 +224,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.10beta03, February 25, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.10beta04, February 25, 2014, are * Copyright (c) 2004, 2006-2013 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: @@ -342,7 +342,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.10beta03 are Y2K compliant. It is my belief that + * upward through 1.6.10beta04 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 @@ -402,9 +402,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.10beta03" +#define PNG_LIBPNG_VER_STRING "1.6.10beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.10beta03 - February 25, 2014\n" + " libpng version 1.6.10beta04 - February 25, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -418,7 +418,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 04 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -548,7 +548,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_10beta03; +typedef char* png_libpng_version_1_6_10beta04; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index daea415e4..d5cf6621b 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.10beta03 - February 25, 2014 + * libpng version 1.6.10beta04 - February 25, 2014 * * 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 52dc5a4ef..03b32bab9 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1991,4 +1991,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_10beta03 Your_png_h_is_not_version_1_6_10beta03; +typedef png_libpng_version_1_6_10beta04 Your_png_h_is_not_version_1_6_10beta04; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 470944bf5..61c99cdb9 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.10beta03 - February 25, 2014 +libpng version 1.6.10beta04 - February 25, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index a76de0812..917ab619d 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@