Change version number to 1.2.6.1.

diff --git a/ChangeLog b/ChangeLog
index 6fa5d4411ac9a9c728206987b267c9f91e3b4b22..9bc4abebc180ca3d50fc7289a1019a68386d3187 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.6.1 (xx Jan 2012)
+- 
+
 Changes in 1.2.6 (29 Jan 2012)
 - Update the Pascal interface in contrib/pascal
 - Fix function numbers for gzgetc_ in zlibvc.def files

diff --git a/Makefile.in b/Makefile.in
index ea430bf2057f8fb27d366e018c8491766814d968..70433ceb18d11294ab2e48f37bdf75d11fdacf46 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.6
+SHAREDLIBV=libz.so.1.2.6.1
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
 

diff --git a/README b/README
index 09070e2c04d2a8ac1f0e929fbb82976ef8279492..1efd8bc7726ece76f904d7dd868501d017b58ad2 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.6 is a general purpose data compression library.  All the code is
+zlib 1.2.6.1 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.6 are documented in the file ChangeLog.
+The changes made in version 1.2.6.1 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 ed96ad495fa34aef77d071fce443fb21d98c8c99..b201942b1c8c9a5736660e6ca9b3b9cf1013f3cf 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.6') TGTRLS(&TGTRLS)
+                          TEXT('ZLIB 1.2.6.1') TGTRLS(&TGTRLS)
 
              ENDPGM

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

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

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

diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index b33d9d9bfef3dd5fbfe1b7e50389f189eb5e68a0..6d8957ecc5cb9b0766a8365d5b60791c125bfd1d 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.6", Info.Version);\r
+            Assert.AreEqual("1.2.6.1", 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 4ce2a1f1f95909d2d61857593cdd7bbedbc5e5c1..3cb7ecb6363eca4f8070087421ed6219133e822f 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.6 Copyright 1995-2012 Mark Adler ";
+   " inflate9 1.2.6.1 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, 203, 69};
+        133, 133, 133, 133, 144, 207, 66};
     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/minizip/configure.ac b/contrib/minizip/configure.ac
index 53adbb89b7aaec4f57893cca15e58ae74ea7ba62..522eab89ec27c497f6fc5674812b3d3555b554ca 100644 (file)
--- a/contrib/minizip/configure.ac
+++ b/contrib/minizip/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([minizip], [1.2.6], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.2.6.1], [bugzilla.redhat.com])
 AC_CONFIG_SRCDIR([minizip.c])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT

diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index 5c9875c1b20fd4b050d85986bd321da08fbe4cda..baf0b0fa64e280f0fca24d3e68bcae1996f66b0c 100644 (file)
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,8 +10,8 @@ unit zlibpas;
 interface
 
 const
-  ZLIB_VERSION = '1.2.6';
-  ZLIB_VERNUM  = $1260;
+  ZLIB_VERSION = '1.2.6.1';
+  ZLIB_VERNUM  = $1261;
 
 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 8f22fab91d3670d4dfaa18512fa18252b9684451..51d7b78b7e22e00fbe39a343c7a99b7ff73240da 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.6,1\r
-  PRODUCTVERSION 1.2.6,1\r
+  FILEVERSION   1.2.6.1,1\r
+  PRODUCTVERSION 1.2.6.1,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.6\0"\r
+      VALUE "FileVersion",     "1.2.6.1\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 8f22fab91d3670d4dfaa18512fa18252b9684451..51d7b78b7e22e00fbe39a343c7a99b7ff73240da 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.6,1\r
-  PRODUCTVERSION 1.2.6,1\r
+  FILEVERSION   1.2.6.1,1\r
+  PRODUCTVERSION 1.2.6.1,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.6\0"\r
+      VALUE "FileVersion",     "1.2.6.1\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 8bd480eb685d3278451e9992a2d61b37408418a8..ad82a4caa2c1232b1558e2a50921da838a8e94af 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.6 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.6.1 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 60bbd58bfb0dba8b66b138363f307bef3c06e427..d0c52886a0058dd9d5a0ed77b14136896424088a 100644 (file)
--- a/inftrees.c
+++ b/inftrees.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.6 Copyright 1995-2012 Mark Adler ";
+   " inflate 1.2.6.1 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, 203, 69};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 207, 66};
     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 4d7ea6a05c404f0350e9c14fab3e38970d421fb6..71b2b09fbc5094fde56f20269562b1204156e2a9 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.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:Add file="../libz.so.1.2.6.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.6.1"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.6.1"/>
+         <QPG:Add file="../libz.so.1.2.6.1" install="/opt/lib/" component="slib"/>
       </QPG:Files>
 
       <QPG:PackageFilter>
@@ -63,7 +63,7 @@
             </QPM:ProductDescription>
 
             <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.2.6</QPM:ReleaseVersion>
+               <QPM:ReleaseVersion>1.2.6.1</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 89963a0ce11a427bacdb9d03666436015bdc2e14..c326a4eec31e6b5df14b8c51b1671ca64637842f 100644 (file)
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.6">
-    <library name="zlib" dlversion="1.2.6" dlname="z">
+<package name="zlib" version="1.2.6.1">
+    <library name="zlib" dlversion="1.2.6.1" 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 d051c79b54072581c485a678de992cd46b37317b..4dd6f491ce1fc914d5a32f9ec33ef000ef7cc2fb 100644 (file)
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "29 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.6
+Version 1.2.6.1
 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 ffa2a78a37f77aa215df1918b68431764b6b5f63..653b67bccd028cab3280b0ba50fb9ac8aa02723f 100644 (file)
Binary files a/zlib.3.pdf and b/zlib.3.pdf differ

diff --git a/zlib.h b/zlib.h
index 79142d1172e8760ac89ac7b2ad92a79928af737c..43d58b6ba6b05acbfe5c57d3c41ba38c4afb4cf9 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.6, January 29th, 2012
+  version 1.2.6.1, 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.6"
-#define ZLIB_VERNUM 0x1260
+#define ZLIB_VERSION "1.2.6.1-motley"
+#define ZLIB_VERNUM 0x1261
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
 #define ZLIB_VER_REVISION 6
-#define ZLIB_VER_SUBREVISION 0
+#define ZLIB_VER_SUBREVISION 1
 
 /*
     The 'zlib' compression library provides in-memory compression and