From 8c3d4f387a7c161e6820fb97c58a55afb001d33f Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 15 Dec 2012 08:33:58 -0600 Subject: [PATCH] [libpng16] Bump version to 1.6.0beta34 --- 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/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 | 2 +- scripts/symbols.def | 2 +- 23 files changed, 57 insertions(+), 53 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 37aae8dcd..c25513fd4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0beta33 - December 15, 2012 +Libpng 1.6.0beta34 - December 15, 2012 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.0beta33.tar.xz (LZMA-compressed, recommended) - 1.6.0beta33.tar.gz - 1.6.0beta33.tar.bz2 + 1.6.0beta34.tar.xz (LZMA-compressed, recommended) + 1.6.0beta34.tar.gz + 1.6.0beta34.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp160b33.7z (LZMA-compressed, recommended) - lp160b33.zip + lp160b34.7z (LZMA-compressed, recommended) + lp160b34.zip Other information: - 1.6.0beta33-README.txt - 1.6.0beta33-LICENSE.txt + 1.6.0beta34-README.txt + 1.6.0beta34-LICENSE.txt Changes since the last public release (1.5.7): @@ -564,6 +564,8 @@ Version 1.6.0beta33 [December 15, 2012] Fixed cases of unquoted DESTDIR in Makefile.am Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.2.5. +Version 1.6.0beta34 [December 15, 2012] + 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 5b7bdea70..f3d0a53e3 100644 --- a/CHANGES +++ b/CHANGES @@ -4316,6 +4316,8 @@ Version 1.6.0beta33 [December 15, 2012] Fixed cases of unquoted DESTDIR in Makefile.am Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.2.5. +Version 1.6.0beta34 [December 15, 2012] + 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 333e482f5..a768c3c79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,7 +260,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.0beta33 +# VERSION 16.${PNGLIB_RELEASE}.1.6.0beta34 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 3d96d587e..8e9d19de1 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.0beta33, December 15, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta34, December 15, 2012, are Copyright (c) 2004, 2006-2012 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 4990983b9..89d010615 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta33 - December 15, 2012 (shared library 16.0) +README for libpng version 1.6.0beta34 - December 15, 2012 (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 ecea4fabd..aa514c61e 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.0beta33],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.0beta34],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -37,7 +37,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.0beta33 +PNGLIB_VERSION=1.6.0beta34 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index da76fcfc8..254436d23 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.0beta33 - December 15, 2012 + libpng version 1.6.0beta34 - December 15, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 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.0beta33 - December 15, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta34 - December 15, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5132,7 +5132,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.0beta33 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta34 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 0de271c29..055fbed1c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "December 15, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta33 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta34 .SH SYNOPSIS \fI\fB @@ -997,7 +997,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.0beta33 - December 15, 2012 + libpng version 1.6.0beta34 - December 15, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1008,7 +1008,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0beta33 - December 15, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta34 - December 15, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -6130,7 +6130,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.0beta33 are Y2K compliant. It is my belief that earlier +upward through 1.6.0beta34 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 @@ -6335,7 +6335,7 @@ the first widely used release: 1.5.7beta01-05 15 10507 15.so.15.7[.0] 1.5.7rc01-03 15 10507 15.so.15.7[.0] 1.5.7 15 10507 15.so.15.7[.0] - 1.6.0beta01-32 16 10600 16.so.16.0[.0] + 1.6.0beta01-34 16 10600 16.so.16.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6392,7 +6392,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta33 - December 15, 2012: +Libpng version 1.6.0beta34 - December 15, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6415,7 +6415,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta33, December 15, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta34, December 15, 2012, 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 027902908..f4217c52b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "December 15, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta33 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta34 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index df32bc9d9..ab8fee3a0 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_0beta33 Your_png_h_is_not_version_1_6_0beta33; +typedef png_libpng_version_1_6_0beta34 Your_png_h_is_not_version_1_6_0beta34; /* 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 @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0beta33 - December 15, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.6.0beta34 - December 15, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2012 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.0beta33 - December 15, 2012\ + return "libpng version 1.6.0beta34 - December 15, 2012\ Copyright (c) 1998-2012 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 50f65a5c1..53dd630f8 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0beta33 - December 15, 2012 + * libpng version 1.6.0beta34 - December 15, 2012 * Copyright (c) 1998-2012 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.0beta33 - December 15, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.6.0beta34 - December 15, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -166,7 +166,7 @@ * 1.5.7beta01-05 15 10507 15.so.15.7[.0] * 1.5.7rc01-03 15 10507 15.so.15.7[.0] * 1.5.7 15 10507 15.so.15.7[.0] - * 1.6.0beta01-32 16 10600 16.so.16.0[.0] + * 1.6.0beta01-34 16 10600 16.so.16.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -198,7 +198,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta33, December 15, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta34, December 15, 2012, are * Copyright (c) 2004, 2006-2012 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: @@ -316,7 +316,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.0beta33 are Y2K compliant. It is my belief that + * upward through 1.6.0beta34 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 @@ -376,9 +376,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.0beta33" +#define PNG_LIBPNG_VER_STRING "1.6.0beta34" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0beta33 - December 15, 2012\n" + " libpng version 1.6.0beta34 - December 15, 2012\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -392,7 +392,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 33 +#define PNG_LIBPNG_VER_BUILD 34 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -522,7 +522,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_0beta33; +typedef char* png_libpng_version_1_6_0beta34; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 5d7c8c38f..53cac4ec5 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0beta33 - December 15, 2012 + * libpng version 1.6.0beta34 - December 15, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 9e2beb24e..994681343 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1949,4 +1949,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_0beta33 Your_png_h_is_not_version_1_6_0beta33; +typedef png_libpng_version_1_6_0beta34 Your_png_h_is_not_version_1_6_0beta34; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 82cea502a..b2da25dc1 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta33 - December 15, 2012 +libpng version 1.6.0beta34 - December 15, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index b8feab641..c27c88e7d 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@