Change version number to 1.2.6.

diff --git a/ChangeLog b/ChangeLog
index 2358385f9c295acf4e1d1ec36f2c9ae9ea642687..198e55f72ac20c27345105dfc0b26942b05795c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.6 (xx Jan 2012)
+- 
+
 Changes in 1.2.5.3 (15 Jan 2012)
 - Restore gzgetc function for binary compatibility
 - Do not use _lseeki64 under Borland C++ [Truta]

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

diff --git a/README b/README
index d52aafda6c27a1ae56d14c6da17c40a528104e79..09070e2c04d2a8ac1f0e929fbb82976ef8279492 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.5.3 is a general purpose data compression library.  All the code is
+zlib 1.2.6 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.3 are documented in the file ChangeLog.
+The changes made in version 1.2.6 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
@@ -84,7 +84,7 @@ Acknowledgments:
 
 Copyright notice:
 
- (C) 1995-2011 Jean-loup Gailly and Mark Adler
+ (C) 1995-2012 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

diff --git a/as400/compile.clp b/as400/compile.clp
index b649b2a2c6008273087341db74d67860c62c6632..ed96ad495fa34aef77d071fce443fb21d98c8c99 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.3') TGTRLS(&TGTRLS)
+                          TEXT('ZLIB 1.2.6') TGTRLS(&TGTRLS)
 
              ENDPGM

diff --git a/as400/readme.txt b/as400/readme.txt
index 7eb5e22f3fb3e16341bb15743231b331b7509644..397fe997d783c59ae16e1547092f0aa7712156e0 100644 (file)
--- a/as400/readme.txt
+++ b/as400/readme.txt
@@ -1,4 +1,4 @@
-        ZLIB version 1.2.5.3 for AS400 installation instructions
+        ZLIB version 1.2.6 for AS400 installation instructions
 
 I) From an AS400 *SAVF file:
 

diff --git a/as400/zlib.inc b/as400/zlib.inc
index 28fb6ae9652d8f09b5873bcb2e91e1dd7603657b..5ce905fd5748992b7bbf73a173d3dfeb26853518 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.3
+      *  Version 1.2.6
       *
       *
       *  WARNING:
@@ -22,14 +22,14 @@
       *
       *  Versioning information.
       *
-     D ZLIB_VERSION    C                   '1.2.5.3'
-     D ZLIB_VERNUM     C                   X'1253'
+     D ZLIB_VERSION    C                   '1.2.6'
+     D ZLIB_VERNUM     C                   X'1260'
      D ZLIB_VER_MAJOR  C                   1
      D ZLIB_VER_MINOR  C                   2
      D ZLIB_VER_REVISION...
-     D                 C                   5
+     D                 C                   6
      D ZLIB_VER_SUBREVISION...
-     D                 C                   3
+     D                 C                   0
       *
       *  Other equates.
       *

diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index 79a6b44ac9dc802a21a6cca30d36cf1f8aa789d2..6daf8bba63d2da975aef554a5052d968b9ea3e85 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.3';
+  zlib_version = '1.2.6';
 
 type
   EZlibError = class(Exception);

diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 39c0eb3c6a9315ffc1af2a03027041fdf3fd8ca4..b33d9d9bfef3dd5fbfe1b7e50389f189eb5e68a0 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.3", Info.Version);\r
+            Assert.AreEqual("1.2.6", 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 440e5dd375f8e250460f55ee7a1269f78aa9e5bf..4ce2a1f1f95909d2d61857593cdd7bbedbc5e5c1 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-2011 Mark Adler
+ * Copyright (C) 1995-2012 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.3 Copyright 1995-2011 Mark Adler ";
+   " inflate9 1.2.6 Copyright 1995-2012 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, 71, 64};
+        133, 133, 133, 133, 144, 203, 69};
     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 be0d4be3f6f5a6f28c4aed9e5775b5725f67b6be..bd13df66d465718e87766090e383bc56af17ef7f 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.3';
+  ZLIB_VERSION = '1.2.6';
 
 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 304a42ffd146f70c914c9f8faa0b78d37e8ac6ac..8f22fab91d3670d4dfaa18512fa18252b9684451 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.3,1\r
-  PRODUCTVERSION 1.2.5.3,1\r
+  FILEVERSION   1.2.6,1\r
+  PRODUCTVERSION 1.2.6,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.3\0"\r
+      VALUE "FileVersion",     "1.2.6\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-2011 Jean-loup Gailly & Mark Adler\0"\r
+      VALUE "LegalCopyright", "(C) 1995-2012 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 304a42ffd146f70c914c9f8faa0b78d37e8ac6ac..8f22fab91d3670d4dfaa18512fa18252b9684451 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.3,1\r
-  PRODUCTVERSION 1.2.5.3,1\r
+  FILEVERSION   1.2.6,1\r
+  PRODUCTVERSION 1.2.6,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.3\0"\r
+      VALUE "FileVersion",     "1.2.6\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-2011 Jean-loup Gailly & Mark Adler\0"\r
+      VALUE "LegalCopyright", "(C) 1995-2012 Jean-loup Gailly & Mark Adler\0"\r
     END\r
   END\r
   BLOCK "VarFileInfo"\r

diff --git a/deflate.c b/deflate.c
index 98c4d6e19ca721b8d842e82d42ebcde176f390cb..8bd480eb685d3278451e9992a2d61b37408418a8 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.5.3 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.6 Copyright 1995-2012 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 b8a2aa4c2bc45270fc3004cfd1c52dbec308f585..60bbd58bfb0dba8b66b138363f307bef3c06e427 100644 (file)
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2012 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.3 Copyright 1995-2011 Mark Adler ";
+   " inflate 1.2.6 Copyright 1995-2012 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, 71, 64};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 69};
     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 c3f33daf2b9da7d8a74d7ab173965dfb07ebe5c1..4d7ea6a05c404f0350e9c14fab3e38970d421fb6 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.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:Add file="../libz.so.1.2.6" 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.6"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.6"/>
+         <QPG:Add file="../libz.so.1.2.6" install="/opt/lib/" component="slib"/>
       </QPG:Files>
 
       <QPG:PackageFilter>
@@ -63,7 +63,7 @@
             </QPM:ProductDescription>
 
             <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.2.5.3</QPM:ReleaseVersion>
+               <QPM:ReleaseVersion>1.2.6</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 9878af120c27cb62e7b3f02ddcf557367ccdc5e8..89963a0ce11a427bacdb9d03666436015bdc2e14 100644 (file)
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.5.3">
-    <library name="zlib" dlversion="1.2.5.3" dlname="z">
+<package name="zlib" version="1.2.6">
+    <library name="zlib" dlversion="1.2.6" 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 c75b502aca7f610a40f86dc46e32552e5dc894e2..d6b0b081a262c68f5274c5143026bf29045e29ca 100644 (file)
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "15 Jan 2012"
+.TH ZLIB 3 "xx Jan 2012"
 .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.3
+Version 1.2.6
 Copyright (C) 1995-2012 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 e6e9421bf0bfb3a6c6d800512859333e57d0500e..7ac376de1faaacaed3a307e9ad5584f4535b3f79 100644 (file)
Binary files a/zlib.3.pdf and b/zlib.3.pdf differ

diff --git a/zlib.h b/zlib.h
index 20bc62c8bfc97e5ceabf2b41a70618501864f6b3..9452fee5baf63da2b7886abb30ed9a62d04c7b24 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.3, January 15th, 2012
+  version 1.2.6, January xxth, 2012
 
   Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
 
@@ -37,12 +37,12 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.5.3"
-#define ZLIB_VERNUM 0x1253
+#define ZLIB_VERSION "1.2.6-motley"
+#define ZLIB_VERNUM 0x1260
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 5
-#define ZLIB_VER_SUBREVISION 3
+#define ZLIB_VER_REVISION 6
+#define ZLIB_VER_SUBREVISION 0
 
 /*
     The 'zlib' compression library provides in-memory compression and