Change version numbers to 1.2.5.2 and release dates

Also added "-motley" to ZLIB_VERSION in zlib.h, so that versions in-between 1.2.5.1 and 1.2.5.2 that are pulled down from github can be identified as such if bugs are reported on them.
14 years ago · d6cbbd5c64
parent 10daf0d4d7
commit d6cbbd5c64
19 changed files with 42 additions and 39 deletions
--- a/3
+++ b/3
@ -1,6 +1,9 @@
                ChangeLog file for zlib
 Changes in 1.2.5.2 (xx Sep 2011)
 - 
 Changes in 1.2.5.1 (10 Sep 2011)
 - Update FAQ entry on shared builds (#13)
 - Avoid symbolic argument to chmod in Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@ -32,7 +32,7 @@ CPP=$(CC) -E
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.5.1
+SHAREDLIBV=libz.so.1.2.5.2
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
--- a/4
+++ b/4
@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.5.1 is a general purpose data compression library.  All the code is
+zlib 1.2.5.2 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
 issue of Dr.  Dobb's Journal; a copy of the article is available at
 http://marknelson.us/1997/01/01/zlib-engine/ .
-The changes made in version 1.2.5.1 are documented in the file ChangeLog.
+The changes made in version 1.2.5.2 are documented in the file ChangeLog.
 Unsupported third party contributions are provided in directory contrib/ .
--- a/as400/compile.clp
+++ b/as400/compile.clp
@ -105,6 +105,6 @@
                                 &MODLIB/TREES       &MODLIB/UNCOMPR     +
                                 &MODLIB/ZUTIL)                          +
                          SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC)       +
-                          TEXT('ZLIB 1.2.5.1') TGTRLS(&TGTRLS)
+                          TEXT('ZLIB 1.2.5.2') TGTRLS(&TGTRLS)
             ENDPGM
--- a/as400/readme.txt
+++ b/as400/readme.txt
@ -1,4 +1,4 @@
-        ZLIB version 1.2.5.1 for AS400 installation instructions
+        ZLIB version 1.2.5.2 for AS400 installation instructions
 I) From an AS400 *SAVF file:
--- a/as400/zlib.inc
+++ b/as400/zlib.inc
@ -1,7 +1,7 @@
      *  ZLIB.INC - Interface to the general purpose compression library
      *
      *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
-      *  Version 1.2.5.1
+      *  Version 1.2.5.2
      *
      *
      *  WARNING:
@ -22,8 +22,8 @@
      *
      *  Versioning information.
      *
-     D ZLIB_VERSION    C                   '1.2.5.1'
+     D ZLIB_VERSION    C                   '1.2.5.2'
-     D ZLIB_VERNUM     C                   X'1251'
+     D ZLIB_VERNUM     C                   X'1252'
     D ZLIB_VER_MAJOR  C                   1
     D ZLIB_VER_MINOR  C                   2
     D ZLIB_VER_REVISION...
--- a/contrib/delphi/ZLib.pas
+++ b/contrib/delphi/ZLib.pas
@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
  const OutBuf: Pointer; BufSize: Integer);
 const
-  zlib_version = '1.2.5.1';
+  zlib_version = '1.2.5.2';
 type
  EZlibError = class(Exception);
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@ -156,7 +156,7 @@ namespace DotZLibTests
        public void Info_Version()
        {
            Info info = new Info();
-            Assert.AreEqual("1.2.5.1", Info.Version);
+            Assert.AreEqual("1.2.5.2", Info.Version);
            Assert.AreEqual(32, info.SizeOfUInt);
            Assert.AreEqual(32, info.SizeOfULong);
            Assert.AreEqual(32, info.SizeOfPointer);
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@ -1,5 +1,5 @@
 /* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2010 Mark Adler
+ * Copyright (C) 1995-2011 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -9,7 +9,7 @@
 #define MAXBITS 15
 const char inflate9_copyright[] =
-   " inflate9 1.2.5.1 Copyright 1995-2010 Mark Adler ";
+   " inflate9 1.2.5.2 Copyright 1995-2011 Mark Adler ";
 /*
  If you use the zlib library in a product, an acknowledgment is welcome
  in the documentation of your product. If for some reason you cannot
@ -64,7 +64,7 @@ unsigned short FAR *work;
    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
        128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
        130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
-        133, 133, 133, 133, 144, 205, 203};
+        133, 133, 133, 133, 144, 202, 194};
    static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
        65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@ -10,7 +10,7 @@ unit zlibpas;
 interface
 const
-  ZLIB_VERSION = '1.2.5.1';
+  ZLIB_VERSION = '1.2.5.2';
 type
  alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
@ -2,8 +2,8 @@
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1.2.5.1,1
+  FILEVERSION	 1.2.5.2,1
-  PRODUCTVERSION 1.2.5.1,1
+  PRODUCTVERSION 1.2.5.2,1
  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
  FILEFLAGS	0
  FILEOS	VOS_DOS_WINDOWS32
@ -17,12 +17,12 @@ BEGIN
    BEGIN
      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.5.1\0"
+      VALUE "FileVersion",	"1.2.5.2\0"
      VALUE "InternalName",	"zlib\0"
      VALUE "OriginalFilename",	"zlib.dll\0"
      VALUE "ProductName",	"ZLib.DLL\0"
      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2011 Jean-loup Gailly & Mark Adler\0"
    END
  END
  BLOCK "VarFileInfo"
--- a/contrib/vstudio/vc9/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@ -2,8 +2,8 @@
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1.2.5.1,1
+  FILEVERSION	 1.2.5.2,1
-  PRODUCTVERSION 1.2.5.1,1
+  PRODUCTVERSION 1.2.5.2,1
  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
  FILEFLAGS	0
  FILEOS	VOS_DOS_WINDOWS32
@ -17,12 +17,12 @@ BEGIN
    BEGIN
      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.5.1\0"
+      VALUE "FileVersion",	"1.2.5.2\0"
      VALUE "InternalName",	"zlib\0"
      VALUE "OriginalFilename",	"zlib.dll\0"
      VALUE "ProductName",	"ZLib.DLL\0"
      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2011 Jean-loup Gailly & Mark Adler\0"
    END
  END
  BLOCK "VarFileInfo"
--- a/deflate.c
+++ b/deflate.c
@ -52,7 +52,7 @@
 #include "deflate.h"
 const char deflate_copyright[] =
-   " deflate 1.2.5.1 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.5.2 Copyright 1995-2011 Jean-loup Gailly and Mark Adler ";
 /*
  If you use the zlib library in a product, an acknowledgment is welcome
  in the documentation of your product. If for some reason you cannot
--- a/inftrees.c
+++ b/inftrees.c
@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2010 Mark Adler
+ * Copyright (C) 1995-2011 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -9,7 +9,7 @@
 #define MAXBITS 15
 const char inflate_copyright[] =
-   " inflate 1.2.5.1 Copyright 1995-2010 Mark Adler ";
+   " inflate 1.2.5.2 Copyright 1995-2011 Mark Adler ";
 /*
  If you use the zlib library in a product, an acknowledgment is welcome
  in the documentation of your product. If for some reason you cannot
@ -62,7 +62,7 @@ unsigned short FAR *work;
        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 205, 203};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 202, 194};
    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
--- a/qnx/package.qpg
+++ b/qnx/package.qpg
@ -25,10 +25,10 @@
      <QPG:Files>
         <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
         <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
-         <QPG:Add file="../libz.so.1.2.5.1" install="/opt/lib/" user="root:bin" permission="644"/>
+         <QPG:Add file="../libz.so.1.2.5.2" install="/opt/lib/" user="root:bin" permission="644"/>
-         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.5.1"/>
+         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.5.2"/>
-         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.5.1"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.5.2"/>
-         <QPG:Add file="../libz.so.1.2.5.1" install="/opt/lib/" component="slib"/>
+         <QPG:Add file="../libz.so.1.2.5.2" install="/opt/lib/" component="slib"/>
      </QPG:Files>
      <QPG:PackageFilter>
@ -63,7 +63,7 @@
            </QPM:ProductDescription>
            <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.2.5.1</QPM:ReleaseVersion>
+               <QPM:ReleaseVersion>1.2.5.2</QPM:ReleaseVersion>
               <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
               <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
               <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
--- a/treebuild.xml
+++ b/treebuild.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.5.1">
+<package name="zlib" version="1.2.5.2">
-    <library name="zlib" dlversion="1.2.5.1" dlname="z">
+    <library name="zlib" dlversion="1.2.5.2" dlname="z">
 	<property name="description"> zip compression library </property>
 	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
--- a/zlib.3
+++ b/zlib.3
@ -1,4 +1,4 @@
-.TH ZLIB 3 "10 Sep 2011"
+.TH ZLIB 3 "xx Sep 2011"
 .SH NAME
 zlib \- compression/decompression library
 .SH SYNOPSIS
@ -125,7 +125,7 @@ before asking for help.
 Send questions and/or comments to zlib@gzip.org,
 or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
 .SH AUTHORS
-Version 1.2.5.1
+Version 1.2.5.2
 Copyright (C) 1995-2011 Jean-loup Gailly (jloup@gzip.org)
 and Mark Adler (madler@alumni.caltech.edu).
 .LP
--- a/zlib.3.pdf
+++ b/zlib.3.pdf
--- a/zlib.h
+++ b/zlib.h
@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.5.1, September 10th, 2011
+  version 1.2.5.2, September xxth, 2011
  Copyright (C) 1995-2011 Jean-loup Gailly and Mark Adler
@ -37,12 +37,12 @@
 extern "C" {
 #endif
-#define ZLIB_VERSION "1.2.5.1"
+#define ZLIB_VERSION "1.2.5.2-motley"
-#define ZLIB_VERNUM 0x1251
+#define ZLIB_VERNUM 0x1252
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
 #define ZLIB_VER_REVISION 5
-#define ZLIB_VER_SUBREVISION 1
+#define ZLIB_VER_SUBREVISION 2
 /*
    The 'zlib' compression library provides in-memory compression and
`@ -1,4 +1,4 @@`
	`ZLIB version 1.2.5.1 for AS400 installation instructions`	`ZLIB version 1.2.5.2 for AS400 installation instructions`

	`I) From an AS400 *SAVF file:`	`I) From an AS400 *SAVF file:`