From 57731529dcbb21ceabd6143b2dc19db7390f0b92 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 27 Dec 2010 21:34:17 -0600 Subject: [PATCH] [devel] Bump to version libpng-1.5.0rc03 --- ANNOUNCE | 20 +++++++++++--------- CHANGES | 4 +++- CMakeLists.txt | 2 +- LICENSE | 2 +- README | 2 +- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 16 ++++++++-------- libpngpf.3 | 2 +- png.c | 6 +++--- png.h | 18 +++++++++--------- pngconf.h | 2 +- pngpriv.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pngwin.def | 2 +- scripts/pngwin.dfn | 2 +- scripts/symbols.def | 2 +- 26 files changed, 74 insertions(+), 70 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 745466841..31e17449b 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.0rc02 - December 28, 2010 +Libpng 1.5.0rc03 - December 28, 2010 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.5.0rc02.tar.xz (LZMA-compressed, recommended) - 1.5.0rc02.tar.gz - 1.5.0rc02.tar.bz2 + 1.5.0rc03.tar.xz (LZMA-compressed, recommended) + 1.5.0rc03.tar.gz + 1.5.0rc03.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp150r02.7z (LZMA-compressed, recommended) - lp150r02.zip + lp150r03.7z (LZMA-compressed, recommended) + lp150r03.zip Other information: - 1.5.0rc02-README.txt - 1.5.0rc02-LICENSE.txt + 1.5.0rc03-README.txt + 1.5.0rc03-LICENSE.txt Changes since the last public release (1.4.1): @@ -481,9 +481,11 @@ Version 1.5.0beta58 [December 19, 2010] Version 1.5.0rc01 [December 28, 2010] No changes. -Version 1.5.0rc02 [December 28, 2010] +Version 1.5.0rc02 [December 27, 2010] Eliminated references to the scripts/*.def files in project/visualc71. +Version 1.5.0rc03 [December 28, 2010] + 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 152f0ae16..7e63239a4 100644 --- a/CHANGES +++ b/CHANGES @@ -3119,9 +3119,11 @@ Version 1.5.0beta58 [December 19, 2010] Version 1.5.0rc01 [December 27, 2010] No changes. -Version 1.5.0rc02 [December 28, 2010] +Version 1.5.0rc02 [December 27, 2010] Eliminated references to the scripts/*.def files in project/visualc71. +Version 1.5.0rc03 [December 28, 2010] + 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 6457c59ea..0356b5376 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -261,7 +261,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.0rc02 +# VERSION 15.${PNGLIB_RELEASE}.1.5.0rc03 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 985af18fb..2a285e3ba 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.0rc02, December 28, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0rc03, December 28, 2010, are Copyright (c) 2004, 2006-2010 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 694ac7b87..2b6244bec 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.0rc02 - December 28, 2010 (shared library 15.0) +README for libpng version 1.5.0rc03 - December 28, 2010 (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 ad8d5192e..035d0a954 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.68 for libpng-1.5.0rc02 +# Generated by GNU Autoconf 2.68 for libpng-1.5.0rc03 # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.0rc02' -PACKAGE_STRING='1.5.0rc02' +PACKAGE_VERSION='1.5.0rc03' +PACKAGE_STRING='1.5.0rc03' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1306,7 +1306,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.0rc02 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.0rc03 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1376,7 +1376,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.0rc02:";; + short | recursive ) echo "Configuration of libpng 1.5.0rc03:";; esac cat <<\_ACEOF @@ -1484,7 +1484,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.0rc02 +libpng configure 1.5.0rc03 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1907,7 +1907,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.0rc02, which was +It was created by libpng $as_me 1.5.0rc03, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2722,7 +2722,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.0rc02' + VERSION='1.5.0rc03' cat >>confdefs.h <<_ACEOF @@ -2786,7 +2786,7 @@ fi -PNGLIB_VERSION=1.5.0rc02 +PNGLIB_VERSION=1.5.0rc03 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 @@ -12993,7 +12993,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.0rc02, which was +This file was extended by libpng $as_me 1.5.0rc03, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13059,7 +13059,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.0rc02 +libpng config.status 1.5.0rc03 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1966d6f4e..9d89cf114 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.0rc02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.0rc03], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.0rc02 +PNGLIB_VERSION=1.5.0rc03 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index aeb3489f6..89a17b86a 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.0rc02 - December 28, 2010 + libpng version 1.5.0rc03 - December 28, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 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.0rc02 - December 28, 2010 + libpng versions 0.97, January 1998, through 1.5.0rc03 - December 28, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1050,7 +1050,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.5.0rc02, not all possible expansions are supported. +As of libpng version 1.5.0rc03, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3816,7 +3816,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.0rc02 are Y2K compliant. It is my belief that earlier +upward through 1.5.0rc03 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index 64cb7d7d5..b5be8558f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "December 28, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0rc03 .SH SYNOPSIS \fI\fB @@ -851,7 +851,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.0rc02 - December 28, 2010 + libpng version 1.5.0rc03 - December 28, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -862,7 +862,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0rc02 - December 28, 2010 + libpng versions 0.97, January 1998, through 1.5.0rc03 - December 28, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1901,7 +1901,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.5.0rc02, not all possible expansions are supported. +As of libpng version 1.5.0rc03, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -4667,7 +4667,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.0rc02 are Y2K compliant. It is my belief that earlier +upward through 1.5.0rc03 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -4848,7 +4848,7 @@ the first widely used release: 1.4.3 14 10403 14.so.14.3[.0] 1.4.4 14 10404 14.so.14.4[.0] 1.5.0beta01-58 15 10500 15.so.15.0[.0] - 1.5.0rc01 15 10500 15.so.15.0[.0] + 1.5.0rc01-03 15 10500 15.so.15.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4905,7 +4905,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.0rc02 - December 28, 2010: +Libpng version 1.5.0rc03 - December 28, 2010: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4928,7 +4928,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.0rc02, December 28, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0rc03, December 28, 2010, 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 8eace55f9..de59ec7fd 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "December 28, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0rc03 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 211648104..2de5cfa2f 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_0rc02 Your_png_h_is_not_version_1_5_0rc02; +typedef png_libpng_version_1_5_0rc03 Your_png_h_is_not_version_1_5_0rc03; /* 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 @@ -555,13 +555,13 @@ png_get_copyright(png_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.0rc02 - December 28, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.5.0rc03 - December 28, 2010" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 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.0rc02 - December 28, 2010\ + return "libpng version 1.5.0rc03 - December 28, 2010\ Copyright (c) 1998-2010 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 ac0e33acc..a7aa4d88a 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.0rc02 - December 28, 2010 + * libpng version 1.5.0rc03 - December 28, 2010 * Copyright (c) 1998-2010 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.5.0rc02 - December 28, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.5.0rc03 - December 28, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -142,7 +142,7 @@ * 1.4.3 14 10403 14.so.14.3[.0] * 1.4.4 14 10404 14.so.14.4[.0] * 1.5.0beta01-58 15 10500 15.so.15.0[.0] - * 1.5.0rc01 15 10500 15.so.15.0[.0] + * 1.5.0rc01-03 15 10500 15.so.15.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -174,7 +174,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.0rc02, December 28, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.0rc03, December 28, 2010, are * Copyright (c) 2004, 2006-2010 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: @@ -292,7 +292,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.0rc02 are Y2K compliant. It is my belief that + * upward through 1.5.0rc03 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -348,9 +348,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.0rc02" +#define PNG_LIBPNG_VER_STRING "1.5.0rc03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.0rc02 - December 28, 2010\n" + " libpng version 1.5.0rc03 - December 28, 2010\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -363,7 +363,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 @@ -505,7 +505,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_0rc02; +typedef char* png_libpng_version_1_5_0rc03; /* 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 1dfeca5b4..85879d53b 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.0rc02 - (PENDING RELEASE) + * libpng version 1.5.0rc03 - (PENDING RELEASE) * * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 65cc4069d..2995e9df2 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.5.0rc02 - (PENDING RELEASE) + * libpng version 1.5.0rc03 - (PENDING RELEASE) * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index c22dc3311..601faa8a1 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1784,4 +1784,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_0rc02 Your_png_h_is_not_version_1_5_0rc02; +typedef png_libpng_version_1_5_0rc03 Your_png_h_is_not_version_1_5_0rc03; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 1f9d9fbb7..27dba8209 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.0rc02 - December 28, 2010 +libpng version 1.5.0rc03 - December 28, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 5a1372bf5..ba57f5a21 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@