From ba356b4e4d9d15a8c8c6359dc49b47bb547a51a4 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 7 May 2016 07:30:10 -0500 Subject: [PATCH] [libpng17] Bump version to 1.7.0beta81 --- ANNOUNCE | 18 ++++++++++-------- CHANGES | 2 ++ CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 18 +++++++++--------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 20 ++++++++++---------- 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, 64 insertions(+), 60 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 76d967dc5..9835e1a71 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta80 - May 6, 2016 +Libpng 1.7.0beta81 - May 7, 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.7.0beta80.tar.xz (LZMA-compressed, recommended) - 1.7.0beta80.tar.gz + 1.7.0beta81.tar.xz (LZMA-compressed, recommended) + 1.7.0beta81.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - /scratch/glennrp/Libpng17/lp170b80.7z (LZMA-compressed, recommended) - /scratch/glennrp/Libpng17/lp170b80.zip + /scratch/glennrp/Libpng17/lp170b81.7z (LZMA-compressed, recommended) + /scratch/glennrp/Libpng17/lp170b81.zip Other information: - 1.7.0beta80-README.txt - 1.7.0beta80-LICENSE.txt - libpng-1.7.0beta80-*.asc (armored detached GPG signatures) + 1.7.0beta81-README.txt + 1.7.0beta81-LICENSE.txt + libpng-1.7.0beta81-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.0): @@ -1290,6 +1290,8 @@ Version 1.7.0beta80 [May 6, 2016] unreachable code in pz_default_settings and eliminated a spurious warning in pngcp for small files. +Version 1.7.0beta81 [May 7, 2016] + 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 3bc6fa290..0243921d2 100644 --- a/CHANGES +++ b/CHANGES @@ -5590,6 +5590,8 @@ Version 1.7.0beta80 [May 6, 2016] unreachable code in pz_default_settings and eliminated a spurious warning in pngcp for small files. +Version 1.7.0beta81 [May 7, 2016] + 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 78ad84e78..0cb116f24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -697,7 +697,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta80 +# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta81 VERSION 17.${PNGLIB_RELEASE}.0 SOVERSION 17 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index af7228392..28d9b4631 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.7.0beta80, May 6, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta81, May 7, 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 @@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 6, 2016 +May 7, 2016 diff --git a/README b/README index 032c5de6f..0db1f419e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta80 - May 6, 2016 (shared library 17.0) +README for libpng version 1.7.0beta81 - May 7, 2016 (shared library 17.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 103a0b9cb..445c8ecb2 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.7.0beta80],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.7.0beta81],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -40,7 +40,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.7.0beta80 +PNGLIB_VERSION=1.7.0beta81 PNGLIB_MAJOR=1 PNGLIB_MINOR=7 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index 21c83d931..e7c158736 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.7.0beta80 - May 6, 2016 + libpng version 1.7.0beta81 - May 7, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 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.7.0beta80 - May 6, 2016 + libpng versions 0.97, January 1998, through 1.7.0beta81 - May 7, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5343,7 +5343,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.7.0beta80 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta81 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 90274e0d6..8a5598bd9 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 6, 2016" +.TH LIBPNG 3 "May 7, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta80 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta81 .SH SYNOPSIS \fB #include \fP @@ -500,7 +500,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.7.0beta80 - May 6, 2016 + libpng version 1.7.0beta81 - May 7, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -511,7 +511,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta80 - May 6, 2016 + libpng versions 0.97, January 1998, through 1.7.0beta81 - May 7, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5843,7 +5843,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.7.0beta80 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta81 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 @@ -5948,7 +5948,7 @@ the first widely used release: 1.6.19rc01-03 16 10619 16.so.16.19[.0] ... 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - 1.7.0beta01-80 17 10700 17.so.17.0[.0] + 1.7.0beta01-81 17 10700 17.so.17.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6004,7 +6004,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta80 - May 6, 2016: +Libpng version 1.7.0beta81 - May 7, 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). @@ -6029,7 +6029,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.7.0beta80, May 6, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta81, May 7, 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 @@ -6128,7 +6128,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 6, 2016 +May 7, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 266147393..833c5ef74 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 6, 2016" +.TH LIBPNGPF 3 "May 7, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta80 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta81 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index df454763b..0fa41e806 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 6, 2016" +.TH PNG 5 "May 7, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 840039b8d..aa2f467ec 100644 --- a/png.c +++ b/png.c @@ -15,7 +15,7 @@ #define PNG_SRC_FILE PNG_SRC_FILE_png /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_7_0beta80 Your_png_h_is_not_version_1_7_0beta80; +typedef png_libpng_version_1_7_0beta81 Your_png_h_is_not_version_1_7_0beta81; /* 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 @@ -705,14 +705,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta80 - May 6, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta81 - May 7, 2016" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2016 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.7.0beta80 - May 6, 2016\ + return "libpng version 1.7.0beta81 - May 7, 2016\ Copyright (c) 1998-2002,2004,2006-2016 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 7930e1843..82414521a 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta80, May 6, 2016 + * libpng version 1.7.0beta81, May 7, 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.7.0beta80, May 6, 2016: + * libpng versions 0.97, January 1998, through 1.7.0beta81, May 7, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta80, May 6, 2016, are + * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta81, May 7, 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 @@ -190,7 +190,7 @@ * 1.6.19rc01-03 16 10619 16.so.16.19[.0] * ... * 1.7.0alpha01-10 17 10700 17.so.17.0[.0] - * 1.7.0beta01-80 17 10700 17.so.17.0[.0] + * 1.7.0beta01-81 17 10700 17.so.17.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -218,13 +218,13 @@ * Y2K compliance in libpng: * ========================= * - * May 6, 2016 + * May 7, 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.7.0beta80 are Y2K compliant. It is my belief that + * upward through 1.7.0beta81 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 @@ -286,9 +286,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.7.0beta80" +#define PNG_LIBPNG_VER_STRING "1.7.0beta81" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta80 - May 6, 2016\n" + " libpng version 1.7.0beta81 - May 7, 2016\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -302,7 +302,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 80 +#define PNG_LIBPNG_VER_BUILD 81 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -562,7 +562,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_7_0beta80; +typedef char* png_libpng_version_1_7_0beta81; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 0f65b98f3..988b214f5 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta80, May 6, 2016 + * libpng version 1.7.0beta81, May 7, 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 b6d8048eb..30aab588d 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2070,4 +2070,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_7_0beta80 Your_png_h_is_not_version_1_7_0beta80; +typedef png_libpng_version_1_7_0beta81 Your_png_h_is_not_version_1_7_0beta81; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 7c2a8ea78..78e7bfe7c 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta80 - May 6, 2016 +libpng version 1.7.0beta81 - May 7, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 2213aecd8..966b2728b 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@