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.

diff --git a/ChangeLog b/ChangeLog
index a4e5384011d83ad452c97ea79dff488947aabbd4..7f3b176b9c2eb62108005a2bd8830e05c070ca3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/Makefile.in b/Makefile.in
index 861970d1b2d9a169f6d0f1cee4157aaf9f26710c..94d9c08cfc069cbd4e7de7bc6c8067a864fa0bd2 100644 (file)
--- 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)
 

diff --git a/README b/README
index 7870cc2f7c1c410a1dc7d67c3f309597cd5291b3..a96fb8acca7e12a5e8b338b2c696c3ddcb30e922 100644 (file)
--- a/README
+++ b/README
@@ -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/ .
 

diff --git a/as400/compile.clp b/as400/compile.clp
index 2f34936c4273b7809ab20f51118a4681f2a0dcaf..a6d94d4bd1f17ed7331f0a79b74a2c529bb0eea4 100644 (file)
--- 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

diff --git a/as400/readme.txt b/as400/readme.txt
index 5b96cecb6de4ea41ac94f91be023b788bdd20303..0b66f266d60b1b53d2795c65854b878d6cea623b 100644 (file)
--- 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:
 

diff --git a/as400/zlib.inc b/as400/zlib.inc
index d492ef3c88b8ba345a4fac8acd6c151fbcfd9a56..71b0e5631c79e18efe3df1267f23179554e0bb09 100644 (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_VERNUM     C                   X'1251'
+     D ZLIB_VERSION    C                   '1.2.5.2'
+     D ZLIB_VERNUM     C                   X'1252'
      D ZLIB_VER_MAJOR  C                   1
      D ZLIB_VER_MINOR  C                   2
      D ZLIB_VER_REVISION...

diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index 8690594d273f925a0baf031bd3c6d31985a39733..44384a7a70478517250751be53b9ced6970afcc2 100644 (file)
--- 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);

diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index e004833a3d212ad7cee025c02ec567b243315f2c..97af4d5b5a4e0dc3e6610d24bf8bf51e98498002 100644 (file)
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
         public void Info_Version()\r
         {\r
             Info info = new Info();\r
-            Assert.AreEqual("1.2.5.1", Info.Version);\r
+            Assert.AreEqual("1.2.5.2", Info.Version);\r
             Assert.AreEqual(32, info.SizeOfUInt);\r
             Assert.AreEqual(32, info.SizeOfULong);\r
             Assert.AreEqual(32, info.SizeOfPointer);\r

diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index dfd003026e7b4b0209bba4519a1585764a82462c..8f60cfdbd9353f0f11c4c4d5c6fd24b962ccae71 100644 (file)
--- 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,

diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index 6f494828fdb95cfe806a53dd42254d057d3c3563..e34f35664cbda5fb1f42348d8d8698b505709431 100644 (file)
--- 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;

diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 00034ea4e79caf1b3dc033c1ebfaa9c346725c64..7de67b9cba2f293b31c82f23472a94eac9de373e 100644 (file)
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
 \r
 #define IDR_VERSION1  1\r
 IDR_VERSION1   VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE\r
-  FILEVERSION   1.2.5.1,1\r
-  PRODUCTVERSION 1.2.5.1,1\r
+  FILEVERSION   1.2.5.2,1\r
+  PRODUCTVERSION 1.2.5.2,1\r
   FILEFLAGSMASK        VS_FFI_FILEFLAGSMASK\r
   FILEFLAGS    0\r
   FILEOS       VOS_DOS_WINDOWS32\r
@@ -17,12 +17,12 @@ BEGIN
 \r
     BEGIN\r
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"\r
-      VALUE "FileVersion",     "1.2.5.1\0"\r
+      VALUE "FileVersion",     "1.2.5.2\0"\r
       VALUE "InternalName",    "zlib\0"\r
       VALUE "OriginalFilename",        "zlib.dll\0"\r
       VALUE "ProductName",     "ZLib.DLL\0"\r
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"\r
-      VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0"\r
+      VALUE "LegalCopyright", "(C) 1995-2011 Jean-loup Gailly & Mark Adler\0"\r
     END\r
   END\r
   BLOCK "VarFileInfo"\r

diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 00034ea4e79caf1b3dc033c1ebfaa9c346725c64..7de67b9cba2f293b31c82f23472a94eac9de373e 100644 (file)
--- a/contrib/vstudio/vc9/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 \r
 #define IDR_VERSION1  1\r
 IDR_VERSION1   VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE\r
-  FILEVERSION   1.2.5.1,1\r
-  PRODUCTVERSION 1.2.5.1,1\r
+  FILEVERSION   1.2.5.2,1\r
+  PRODUCTVERSION 1.2.5.2,1\r
   FILEFLAGSMASK        VS_FFI_FILEFLAGSMASK\r
   FILEFLAGS    0\r
   FILEOS       VOS_DOS_WINDOWS32\r
@@ -17,12 +17,12 @@ BEGIN
 \r
     BEGIN\r
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"\r
-      VALUE "FileVersion",     "1.2.5.1\0"\r
+      VALUE "FileVersion",     "1.2.5.2\0"\r
       VALUE "InternalName",    "zlib\0"\r
       VALUE "OriginalFilename",        "zlib.dll\0"\r
       VALUE "ProductName",     "ZLib.DLL\0"\r
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"\r
-      VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0"\r
+      VALUE "LegalCopyright", "(C) 1995-2011 Jean-loup Gailly & Mark Adler\0"\r
     END\r
   END\r
   BLOCK "VarFileInfo"\r

diff --git a/deflate.c b/deflate.c
index 01d094e4c4f235ba179fa1e8b0aba57eaba52e04..d9d141a7d67e957ad16ec726895ba0822e794e0b 100644 (file)
--- 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

diff --git a/inftrees.c b/inftrees.c
index 2022e96428c5205eedfbfc7c2bbbfe16bad6eead..92fd13106ce9249c2abe9413bbdced4ce51316cc 100644 (file)
--- 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,

diff --git a/qnx/package.qpg b/qnx/package.qpg
index c75c4b3a5826547a8fe178a871d1fa3784deb288..4072d80116648e4178aaad380fe3882174ae662b 100644 (file)
--- 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" install="/opt/lib/" component="dev" 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.1"/>
-         <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/" user="root:bin" permission="644"/>
+         <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.2"/>
+         <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>

diff --git a/treebuild.xml b/treebuild.xml
index b966b2bb12268b9419df2d24a913f728a7ab4cde..e1091d4749ca58cff388c1c081193ad1ace4663d 100644 (file)
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.5.1">
-    <library name="zlib" dlversion="1.2.5.1" dlname="z">
+<package name="zlib" version="1.2.5.2">
+    <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)" />
 

diff --git a/zlib.3 b/zlib.3
index 66100beee287331377b7f34da37a4fde0795e1cb..01d9d06c286baa7efd5b876e47fee2e190800ac6 100644 (file)
--- 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

diff --git a/zlib.3.pdf b/zlib.3.pdf
index b25379797b2a3eb2a70b91467763cf334bb41e3d..08544adc1530aaa7c956116278aafb50d17219e1 100644 (file)
Binary files a/zlib.3.pdf and b/zlib.3.pdf differ

diff --git a/zlib.h b/zlib.h
index 7c0a2d887daa7d0000f7893b1e09e0f0b0bd3354..8c722a6c86b50d0b591c5a1d52e76a842bc65a97 100644 (file)
--- 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_VERNUM 0x1251
+#define ZLIB_VERSION "1.2.5.2-motley"
+#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