From 04afaab56ad50345c51e5dda12b95085b9bed4f9 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 3 Feb 2012 00:34:07 -0600 Subject: [PATCH] [libpng16] Bump version to 1.6.0beta10 --- ANNOUNCE | 4 ++-- CHANGES | 2 +- INSTALL | 9 ++------- LICENSE | 4 ++-- README | 2 +- libpng-config.in | 0 libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 6 +++++- scripts/pnglibconf.h.prebuilt | 2 +- 17 files changed, 36 insertions(+), 37 deletions(-) mode change 100755 => 100644 libpng-config.in diff --git a/ANNOUNCE b/ANNOUNCE index 760f0a02b..aaea38cfe 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0beta10 - February 2, 2012 +Libpng 1.6.0beta10 - February 3, 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. @@ -170,7 +170,7 @@ Version 1.6.0beta08 [February 1, 2012] Version 1.6.0beta09 [February 1, 2011] Reverted the prebuilt configure files to libpng-1.6.0beta05 condition. -Version 1.6.0beta10 [February 2, 2012] +Version 1.6.0beta10 [February 3, 2012] Added Z_SOLO for zlib-1.2.6+ and correct pngstest tests Updated list of test images in CMakeLists.txt diff --git a/CHANGES b/CHANGES index 5220fc70c..44ca112ae 100644 --- a/CHANGES +++ b/CHANGES @@ -3921,7 +3921,7 @@ Version 1.6.0beta08 [February 1, 2012] Version 1.6.0beta09 [February 1, 2011] Reverted the prebuilt configure files to libpng-1.6.0beta05 condition. -Version 1.6.0beta10 [February 2, 2012] +Version 1.6.0beta10 [February 3, 2012] Added Z_SOLO for zlib-1.2.6+ and correct pngstest tests Updated list of test images in CMakeLists.txt diff --git a/INSTALL b/INSTALL index 319f62716..2644c7a4f 100644 --- a/INSTALL +++ b/INSTALL @@ -17,18 +17,13 @@ aren't using any of the included pre-built scripts, you can do this: ./configure --enable-maintainer-mode make maintainer-clean - ./autogen.sh # only in a GIT clone; see below! + ./autogen.sh --maintainer --clean + ./autogen.sh --maintainer ./configure [--prefix=/path] [other options] make make install make check -As of libpng-1.6.0, autogen.sh only works properly in a -git clone. If you are working with a tar distribution, you must -get a git clone, run autogen.sh there, and then copy the resulting -configuration files from there to your working directory. Then you can -run configure and make as previously with earlier versions of libpng. - Instead, you can use one of the custom-built makefiles in the "scripts" directory diff --git a/LICENSE b/LICENSE index 59afa1bf8..a0a1eff34 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.0beta10, February 1, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta10, February 3, 2012, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 1, 2012 +February 3, 2012 diff --git a/README b/README index 0720d9d8e..07917f74b 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta10 - February 1, 2012 (shared library 16.0) +README for libpng version 1.6.0beta10 - February 3, 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/libpng-config.in b/libpng-config.in old mode 100755 new mode 100644 diff --git a/libpng-manual.txt b/libpng-manual.txt index e327b9aba..e472eec88 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.0beta10 - February 1, 2012 + libpng version 1.6.0beta10 - February 3, 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.0beta10 - February 1, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta10 - February 3, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5043,7 +5043,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -February 1, 2012 +February 3, 2012 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index e549e0a54..b1c39f40e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "February 1, 2012" +.TH LIBPNG 3 "February 3, 2012" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta10 .SH SYNOPSIS @@ -1003,7 +1003,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.0beta10 - February 1, 2012 + libpng version 1.6.0beta10 - February 3, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1014,7 +1014,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0beta10 - February 1, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta10 - February 3, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -6047,7 +6047,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -February 1, 2012 +February 3, 2012 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6315,7 +6315,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta10 - February 1, 2012: +Libpng version 1.6.0beta10 - February 3, 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). @@ -6338,7 +6338,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta10, February 1, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta10, February 3, 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 @@ -6437,7 +6437,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 1, 2012 +February 3, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index cc7a4f558..4008a88a7 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "February 1, 2012" +.TH LIBPNGPF 3 "February 3, 2012" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta10 (private functions) diff --git a/png.5 b/png.5 index 819d1b97c..c60b57868 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "February 1, 2012" +.TH PNG 5 "February 3, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 953a243ba..2a65ff793 100644 --- a/png.c +++ b/png.c @@ -762,13 +762,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0beta10 - February 1, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.6.0beta10 - February 3, 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.0beta10 - February 1, 2012\ + return "libpng version 1.6.0beta10 - February 3, 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 f9f2b9051..1434be2a8 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0beta10 - February 1, 2012 + * libpng version 1.6.0beta10 - February 3, 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.0beta10 - February 1, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.6.0beta10 - February 3, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -198,7 +198,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta10, February 1, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta10, February 3, 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: @@ -310,7 +310,7 @@ * Y2K compliance in libpng: * ========================= * - * February 1, 2012 + * February 3, 2012 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -376,7 +376,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.0beta10" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0beta10 - February 1, 2012\n" + " libpng version 1.6.0beta10 - February 3, 2012\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 6b532b4d3..2108226e2 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0beta10 - February 1, 2012 + * libpng version 1.6.0beta10 - February 3, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 28854c776..668e07364 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta10 - February 1, 2012 +libpng version 1.6.0beta10 - February 3, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index e8d42c7b4..b64853778 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@