Change version numbers to 1.2.5.3.

diff --git a/ChangeLog b/ChangeLog
index 8b12c6465e7af469d9a5c00249660ff3be8a7485..3d27f00b68a0710106a8838250531e6886703198 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.5.3 (xx Dec 2011)
+- 
+
 Changes in 1.2.5.2 (17 Dec 2011)
 - fix ld error: unable to find version dependency 'ZLIB_1.2.5'
 - use relative symlinks for shared libs

diff --git a/Makefile.in b/Makefile.in
index 1d6a8c7284cd5216141acfe21f940e999346b056..81aa4fd9b83e362e6e9ca2fcfdc2cfc5392b5832 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.2
+SHAREDLIBV=libz.so.1.2.5.3
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
 

diff --git a/README b/README
index 02dc3dc5d0095605014d5d933ba769ff0d87210c..d52aafda6c27a1ae56d14c6da17c40a528104e79 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.5.2 is a general purpose data compression library.  All the code is
+zlib 1.2.5.3 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.2 are documented in the file ChangeLog.
+The changes made in version 1.2.5.3 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 a6d94d4bd1f17ed7331f0a79b74a2c529bb0eea4..b649b2a2c6008273087341db74d67860c62c6632 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.2') TGTRLS(&TGTRLS)
+                          TEXT('ZLIB 1.2.5.3') TGTRLS(&TGTRLS)
 
              ENDPGM

diff --git a/as400/readme.txt b/as400/readme.txt
index 0b66f266d60b1b53d2795c65854b878d6cea623b..c3690d7898fe77b80a53e79fac94b3943b43b119 100644 (file)
--- a/as400/readme.txt
+++ b/as400/readme.txt
@@ -1,4 +1,4 @@
-        ZLIB version 1.2.5.2 for AS400 installation instructions
+        ZLIB version 1.2.5.3 for AS400 installation instructions
 
 I) From an AS400 *SAVF file:
 

diff --git a/as400/zlib.inc b/as400/zlib.inc
index f0915c8206e997b90e798f2d209666a0c13ed814..d710e13d13c689c55dba3ad4c2bfbdb16bfc23aa 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.2
+      *  Version 1.2.5.3
       *
       *
       *  WARNING:
@@ -22,8 +22,8 @@
       *
       *  Versioning information.
       *
-     D ZLIB_VERSION    C                   '1.2.5.2'
-     D ZLIB_VERNUM     C                   X'1252'
+     D ZLIB_VERSION    C                   '1.2.5.3'
+     D ZLIB_VERNUM     C                   X'1253'
      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 44384a7a70478517250751be53b9ced6970afcc2..79a6b44ac9dc802a21a6cca30d36cf1f8aa789d2 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.2';
+  zlib_version = '1.2.5.3';
 
 type
   EZlibError = class(Exception);

diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 97af4d5b5a4e0dc3e6610d24bf8bf51e98498002..39c0eb3c6a9315ffc1af2a03027041fdf3fd8ca4 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.2", Info.Version);\r
+            Assert.AreEqual("1.2.5.3", 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 8f60cfdbd9353f0f11c4c4d5c6fd24b962ccae71..440e5dd375f8e250460f55ee7a1269f78aa9e5bf 100644 (file)
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate9_copyright[] =
-   " inflate9 1.2.5.2 Copyright 1995-2011 Mark Adler ";
+   " inflate9 1.2.5.3 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, 202, 194};
+        133, 133, 133, 133, 144, 71, 64};
     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 e34f35664cbda5fb1f42348d8d8698b505709431..be0d4be3f6f5a6f28c4aed9e5775b5725f67b6be 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.2';
+  ZLIB_VERSION = '1.2.5.3';
 
 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 7de67b9cba2f293b31c82f23472a94eac9de373e..304a42ffd146f70c914c9f8faa0b78d37e8ac6ac 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.2,1\r
-  PRODUCTVERSION 1.2.5.2,1\r
+  FILEVERSION   1.2.5.3,1\r
+  PRODUCTVERSION 1.2.5.3,1\r
   FILEFLAGSMASK        VS_FFI_FILEFLAGSMASK\r
   FILEFLAGS    0\r
   FILEOS       VOS_DOS_WINDOWS32\r
@@ -17,7 +17,7 @@ BEGIN
 \r
     BEGIN\r
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"\r
-      VALUE "FileVersion",     "1.2.5.2\0"\r
+      VALUE "FileVersion",     "1.2.5.3\0"\r
       VALUE "InternalName",    "zlib\0"\r
       VALUE "OriginalFilename",        "zlib.dll\0"\r
       VALUE "ProductName",     "ZLib.DLL\0"\r

diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 7de67b9cba2f293b31c82f23472a94eac9de373e..304a42ffd146f70c914c9f8faa0b78d37e8ac6ac 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.2,1\r
-  PRODUCTVERSION 1.2.5.2,1\r
+  FILEVERSION   1.2.5.3,1\r
+  PRODUCTVERSION 1.2.5.3,1\r
   FILEFLAGSMASK        VS_FFI_FILEFLAGSMASK\r
   FILEFLAGS    0\r
   FILEOS       VOS_DOS_WINDOWS32\r
@@ -17,7 +17,7 @@ BEGIN
 \r
     BEGIN\r
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"\r
-      VALUE "FileVersion",     "1.2.5.2\0"\r
+      VALUE "FileVersion",     "1.2.5.3\0"\r
       VALUE "InternalName",    "zlib\0"\r
       VALUE "OriginalFilename",        "zlib.dll\0"\r
       VALUE "ProductName",     "ZLib.DLL\0"\r

diff --git a/deflate.c b/deflate.c
index 096207d6c3dc5e5e712d4d1505c07b5da1e45983..f27febbbd115dd76643c73ba49a0301c03c00610 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.5.2 Copyright 1995-2011 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.5.3 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 6cd53f0150fd25d758e9327132230c3c67f613b6..b8a2aa4c2bc45270fc3004cfd1c52dbec308f585 100644 (file)
--- a/inftrees.c
+++ b/inftrees.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.5.2 Copyright 1995-2011 Mark Adler ";
+   " inflate 1.2.5.3 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, 202, 194};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 71, 64};
     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 4072d80116648e4178aaad380fe3882174ae662b..c3f33daf2b9da7d8a74d7ab173965dfb07ebe5c1 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.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:Add file="../libz.so.1.2.5.3" 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.3"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.5.3"/>
+         <QPG:Add file="../libz.so.1.2.5.3" install="/opt/lib/" component="slib"/>
       </QPG:Files>
 
       <QPG:PackageFilter>
@@ -63,7 +63,7 @@
             </QPM:ProductDescription>
 
             <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.2.5.2</QPM:ReleaseVersion>
+               <QPM:ReleaseVersion>1.2.5.3</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 e1091d4749ca58cff388c1c081193ad1ace4663d..9878af120c27cb62e7b3f02ddcf557367ccdc5e8 100644 (file)
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.5.2">
-    <library name="zlib" dlversion="1.2.5.2" dlname="z">
+<package name="zlib" version="1.2.5.3">
+    <library name="zlib" dlversion="1.2.5.3" 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 69e28551ca721c35e164a5c8fac570cb2836ba41..e906b8d8ed2d15c7a5d025c5c9ab4e88905b6208 100644 (file)
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "17 Dec 2011"
+.TH ZLIB 3 "xx Dec 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.2
+Version 1.2.5.3
 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 1ff8ac7920dec16fef7972a58a203b4305d47638..cd4a7aefa4338afd1791d1faaf13be0b23d59517 100644 (file)
Binary files a/zlib.3.pdf and b/zlib.3.pdf differ

diff --git a/zlib.h b/zlib.h
index fbe0854ce66b745bb24670af859d76402131c8ce..4364ccfcec594f35856360129cc4a77085f41ea2 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.2, December 17th, 2011
+  version 1.2.5.3, December 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.2"
-#define ZLIB_VERNUM 0x1252
+#define ZLIB_VERSION "1.2.5.3-motley"
+#define ZLIB_VERNUM 0x1253
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
 #define ZLIB_VER_REVISION 5
-#define ZLIB_VER_SUBREVISION 2
+#define ZLIB_VER_SUBREVISION 3
 
 /*
     The 'zlib' compression library provides in-memory compression and