From 98914f74bfdd576ad3f4e4a06ca8b2bf24efa4ed Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 29 Apr 2010 10:54:45 -0500 Subject: [PATCH] [devel] Bump back to version libpng-1.5.0beta24 --- ANNOUNCE | 16 +++++++------- CMakeLists.txt | 2 +- INSTALL | 4 ++-- LICENSE | 2 +- README | 2 +- configure | 22 +++++++++---------- configure.ac | 4 ++-- ...-1.5.0beta23.txt => libpng-1.5.0beta24.txt | 8 +++---- libpng.3 | 14 ++++++------ libpngpf.3 | 2 +- png.c | 6 ++--- png.h | 16 +++++++------- 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/pnglibconf.h | 2 +- scripts/pngwin.def | 2 +- scripts/symbols.def | 2 +- 26 files changed, 68 insertions(+), 68 deletions(-) rename libpng-1.5.0beta23.txt => libpng-1.5.0beta24.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 15a7a7204..c62a99e23 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.0beta23 - April 29, 2010 +Libpng 1.5.0beta24 - April 29, 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.0beta23.tar.xz (LZMA-compressed, recommended) - 1.5.0beta23.tar.gz - 1.5.0beta23.tar.bz2 + 1.5.0beta24.tar.xz (LZMA-compressed, recommended) + 1.5.0beta24.tar.gz + 1.5.0beta24.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp150b23.zip - lp150b23.7z + lp150b24.zip + lp150b24.7z Other information: - 1.5.0beta23-README.txt - 1.5.0beta23-LICENSE.txt + 1.5.0beta24-README.txt + 1.5.0beta24-LICENSE.txt Changes since the last public release (1.4.1): diff --git a/CMakeLists.txt b/CMakeLists.txt index 1152b7baf..c28cd5de5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,7 +207,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta23 +# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta24 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 709068563..bf87c11b2 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.5.0beta23 - April 29, 2010 +Installing libpng version 1.5.0beta24 - April 29, 2010 On Unix/Linux and similar systems, you can simply type @@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.5.0beta23" or "libpng15" and "zlib-1.2.3" +might be called "libpng-1.5.0beta24" or "libpng15" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: diff --git a/LICENSE b/LICENSE index c3b3c0e46..ecfed7e52 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.0beta23, April 29, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta24, April 29, 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/README b/README index b617e3c6b..ba61319db 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.0beta23 - April 29, 2010 (shared library 15.0) +README for libpng version 1.5.0beta24 - April 29, 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 7a287c2dd..0f903de87 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.65 for libpng 1.5.0beta23. +# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta24. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.0beta23' -PACKAGE_STRING='libpng 1.5.0beta23' +PACKAGE_VERSION='1.5.0beta24' +PACKAGE_STRING='libpng 1.5.0beta24' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1432,7 +1432,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.0beta23 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.0beta24 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.0beta23:";; + short | recursive ) echo "Configuration of libpng 1.5.0beta24:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.0beta23 +libpng configure 1.5.0beta24 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2032,7 +2032,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.0beta23, which was +It was created by libpng $as_me 1.5.0beta24, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2840,7 +2840,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.0beta23' + VERSION='1.5.0beta24' cat >>confdefs.h <<_ACEOF @@ -2904,7 +2904,7 @@ fi -PNGLIB_VERSION=1.5.0beta23 +PNGLIB_VERSION=1.5.0beta24 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 @@ -12119,7 +12119,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.0beta23, which was +This file was extended by libpng $as_me 1.5.0beta24, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12185,7 +12185,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.0beta23 +libpng config.status 1.5.0beta24 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 99731465d..e28aaef41 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.0beta23], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.0beta24], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.0beta23 +PNGLIB_VERSION=1.5.0beta24 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 diff --git a/libpng-1.5.0beta23.txt b/libpng-1.5.0beta24.txt similarity index 99% rename from libpng-1.5.0beta23.txt rename to libpng-1.5.0beta24.txt index 52f585c73..e5179a540 100644 --- a/libpng-1.5.0beta23.txt +++ b/libpng-1.5.0beta24.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.5.0beta23 - April 29, 2010 + libpng version 1.5.0beta24 - April 29, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0beta23 - April 29, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta24 - April 29, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -906,7 +906,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.0beta23, not all possible expansions are supported. +As of libpng version 1.5.0beta24, 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 @@ -3307,7 +3307,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.0beta23 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta24 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 19ebe13ff..23f6b543b 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "April 29, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta23 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta24 .SH SYNOPSIS \fI\fB @@ -789,7 +789,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.5.0beta23 - April 29, 2010 + libpng version 1.5.0beta24 - April 29, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -800,7 +800,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0beta23 - April 29, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta24 - April 29, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1695,7 +1695,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.0beta23, not all possible expansions are supported. +As of libpng version 1.5.0beta24, 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 @@ -4096,7 +4096,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.0beta23 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta24 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 @@ -4330,7 +4330,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.0beta23 - April 29, 2010: +Libpng version 1.5.0beta24 - April 29, 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). @@ -4353,7 +4353,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.0beta23, April 29, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta24, April 29, 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 af1dfdee6..2fd2bf367 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "April 29, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta23 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta24 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 2e005c0b4..b5fbc1497 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 version_1_5_0beta23 Your_png_h_is_not_version_1_5_0beta23; +typedef version_1_5_0beta24 Your_png_h_is_not_version_1_5_0beta24; /* Version information for C files. This had better match the version * string defined in png.h. @@ -548,13 +548,13 @@ png_get_copyright(png_structp png_ptr) #else # ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.5.0beta23 - April 29, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.5.0beta24 - April 29, 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 ((png_charp) "libpng version 1.5.0beta23 - April 29, 2010\ + return ((png_charp) "libpng version 1.5.0beta24 - April 29, 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 bcd3e73fa..881e629dd 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.0beta23 - April 29, 2010 + * libpng version 1.5.0beta24 - April 29, 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.0beta23 - April 29, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.5.0beta24 - April 29, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -170,7 +170,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta23, April 29, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta24, April 29, 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: @@ -288,7 +288,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.0beta23 are Y2K compliant. It is my belief that earlier + * upward through 1.5.0beta24 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 @@ -344,9 +344,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.0beta23" +#define PNG_LIBPNG_VER_STRING "1.5.0beta24" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.0beta23 - April 29, 2010\n" + " libpng version 1.5.0beta24 - April 29, 2010\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -359,7 +359,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 23 +#define PNG_LIBPNG_VER_BUILD 24 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -834,7 +834,7 @@ typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp),); /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef png_structp version_1_5_0beta23; +typedef png_structp version_1_5_0beta24; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index f5569fa8f..07b041690 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.0beta23 - April 29, 2010 + * libpng version 1.5.0beta24 - April 29, 2010 * * 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 38d49dad3..ead53cf37 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.5.0beta23 - April 29, 2010 + * libpng version 1.5.0beta24 - April 29, 2010 * 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 1d4036749..f712dcbb3 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1632,4 +1632,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_5_0beta23 your_png_h_is_not_version_1_5_0beta23; +typedef version_1_5_0beta24 your_png_h_is_not_version_1_5_0beta24; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 9b90a603a..ed2878b85 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.0beta23 - April 29, 2010 +libpng version 1.5.0beta24 - April 29, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 969baac22..9dbffadcd 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@