From 45599ad00fec4b66a1000d4b99b3c4ba22d87e07 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 14 Jun 2011 07:09:38 -0500 Subject: [PATCH] [devel] Imported from libpng-1.5.4beta02.tar --- CMakeLists.txt | 2 +- LICENSE | 2 +- README | 2 +- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpngpf.3 | 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 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b38bbaae..943b5abd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,7 +260,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.4beta01 +# VERSION 15.${PNGLIB_RELEASE}.1.5.4beta02 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 97ba1f1bf..d75dab017 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.4beta01, June 14, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.4beta02, June 14, 2011, are Copyright (c) 2004, 2006-2011 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 ff3d27787..463430c67 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.4beta01 - June 14, 2011 (shared library 15.0) +README for libpng version 1.5.4beta02 - June 14, 2011 (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 33e841a7d..ae55c7277 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.4beta01. +# Generated by GNU Autoconf 2.68 for libpng 1.5.4beta02. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.4beta01' -PACKAGE_STRING='libpng 1.5.4beta01' +PACKAGE_VERSION='1.5.4beta02' +PACKAGE_STRING='libpng 1.5.4beta02' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1307,7 +1307,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.4beta01 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.4beta02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1377,7 +1377,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.4beta01:";; + short | recursive ) echo "Configuration of libpng 1.5.4beta02:";; esac cat <<\_ACEOF @@ -1485,7 +1485,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.4beta01 +libpng configure 1.5.4beta02 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1908,7 +1908,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.4beta01, which was +It was created by libpng $as_me 1.5.4beta02, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2723,7 +2723,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.4beta01' + VERSION='1.5.4beta02' cat >>confdefs.h <<_ACEOF @@ -2787,7 +2787,7 @@ fi -PNGLIB_VERSION=1.5.4beta01 +PNGLIB_VERSION=1.5.4beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=4 @@ -13040,7 +13040,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.4beta01, which was +This file was extended by libpng $as_me 1.5.4beta02, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13106,7 +13106,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.4beta01 +libpng config.status 1.5.4beta02 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1647b66df..e8dd46c87 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.4beta01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.4beta02], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.4beta01 +PNGLIB_VERSION=1.5.4beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=4 diff --git a/libpngpf.3 b/libpngpf.3 index 893b5d4d1..9da79a1f0 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "June 14, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.4beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.4beta02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 3d3e684f4..ea3579d29 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.4beta01 - June 14, 2011 +libpng version 1.5.4beta02 - June 14, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index a36e9d510..009b189cc 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@