* libtiff 4.0.6 released.

8 files changed, 22 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 25711b3c..5b77723d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-09-12  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
+	* libtiff 4.0.6 released.
+
 	* html/v4.0.6.html: Added release notes for 4.0.6.
 
 2015-09-06  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
index 5ce51701..9293592b 100644
--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -53,24 +53,11 @@ Notes on releasing.
    have been added, removed, or interface structures have changed,
    then more care is required.
 
-7. Increment the release version in CMakeLists.txt.  Change the
-   'project' property similar to
-
-     # Project version
-     project(tiff VERSION 4.0.5 LANGUAGES C)
-
-8. Update library ELF versioning in CMakeLists.txt.  This is a raw ELF
-   SO version specification similar to:
-
-     # Library version (unlike libtool's baroque scheme, WYSIWYG here)
-     set(SO_COMPATVERSION 5)
-     set(SO_VERSION 5.2.2)
-
-9. Add an entry to Changelog similar to:
+7. Add an entry to Changelog similar to:
 
      * libtiff 4.0.0 released.
 
-10. In the source tree do
+8. In the source tree do
 
      ./autogen.sh
 
@@ -78,7 +65,7 @@ Notes on releasing.
    maintainer build with current autoconf, automake, and libtool
    packages.  It is only needed when updating tool versions.
 
-11. It is recommended (but not required) to build outside of the source
+9. It is recommended (but not required) to build outside of the source
    tree so that the source tree is kept in a pristine state.  This
    also allows sharing the source directory on several networked
    systems.  For example:
@@ -91,17 +78,17 @@ Notes on releasing.
 
      ./configure --enable-maintainer-mode
 
-12. In the build tree do
+10. In the build tree do
 
      make release
 
    This will update "RELEASE-DATE", "VERSION", and libtiff/tiffvers.h
    in the source tree.
 
-13. In the source tree, verify that the version info in RELEASE-DATE,
+11. In the source tree, verify that the version info in RELEASE-DATE,
    VERSION and libtiff/tiffvers.h is right.
 
-14. In the build tree do
+12. In the build tree do
 
       make
       make distcheck
@@ -112,21 +99,21 @@ Notes on releasing.
     Two files with names tiff-version.tar.gz and tiff-version.zip will
     be created in the top level build directory.
 
-15. In the source tree do
+13. In the source tree do
 
       'cvs commit'.
 
-16. In the source tree do
+14. In the source tree do
 
       cvs tag Release-v4-0-0
 
     (or the appropriate name for the release)
 
-17. Copy release packages from the build tree to the
+15. Copy release packages from the build tree to the
     ftp.remotesensing.org ftp site.
 
       scp tiff-*.tar.gz tiff-*.zip \
     	 warmerdam@upload.osgeo.org:/osgeo/download/libtiff
 
-18. Announce to list, tiff@lists.maptools.org
+16. Announce to list, tiff@lists.maptools.org
 
diff --git a/RELEASE-DATE b/RELEASE-DATE
index 478dd185..ae758a75 100644
--- a/RELEASE-DATE
+++ b/RELEASE-DATE
@@ -1 +1 @@
-20150830
+20150912
diff --git a/VERSION b/VERSION
index 7636e756..d13e837c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.5
+4.0.6
diff --git a/configure b/configure
index 51a34b7e..a2ca711b 100755
--- a/configure
+++ b/configure
@@ -3584,13 +3584,13 @@ fi
 
 LIBTIFF_MAJOR_VERSION=4
 LIBTIFF_MINOR_VERSION=0
-LIBTIFF_MICRO_VERSION=5
+LIBTIFF_MICRO_VERSION=6
 LIBTIFF_ALPHA_VERSION=
 LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
 LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"`
 
 LIBTIFF_CURRENT=7
-LIBTIFF_REVISION=3
+LIBTIFF_REVISION=4
 LIBTIFF_AGE=2
 LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE
 
diff --git a/configure.ac b/configure.ac
index c195bd8c..cbe85685 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ dnl Versioning.
 dnl Don't fill the ALPHA_VERSION field, if not applicable.
 LIBTIFF_MAJOR_VERSION=4
 LIBTIFF_MINOR_VERSION=0
-LIBTIFF_MICRO_VERSION=5
+LIBTIFF_MICRO_VERSION=6
 LIBTIFF_ALPHA_VERSION=
 LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
 dnl This will be used with the 'make release' target
@@ -77,7 +77,7 @@ dnl     increment age.
 dnl  6. If any interfaces have been removed since the last public release,
 dnl     then set age to 0.                                
 LIBTIFF_CURRENT=7
-LIBTIFF_REVISION=3
+LIBTIFF_REVISION=4
 LIBTIFF_AGE=2
 LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE
 
diff --git a/html/index.html b/html/index.html
index 11cd3418..2f0c55e1 100644
--- a/html/index.html
+++ b/html/index.html
@@ -24,7 +24,7 @@
     </tr>
     <tr>
       <th>Latest Stable Release</th>
-      <td><a href="v4.0.5.html">v4.0.5</a></td>
+      <td><a href="v4.0.6.html">v4.0.6</a></td>
     </tr>
     <tr>
       <th>Master Download Site</th>
@@ -117,7 +117,7 @@
   </ul>
   <hr>
   <p>
-    Last updated  $Date: 2015-08-30 17:37:47 $.
+    Last updated  $Date: 2015-09-12 19:46:25 $.
   </p>
 </body>
 </html>
diff --git a/libtiff/tiffvers.h b/libtiff/tiffvers.h
index 68839420..e965814b 100644
--- a/libtiff/tiffvers.h
+++ b/libtiff/tiffvers.h
@@ -1,4 +1,4 @@
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.5\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.6\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
 /*
  * This define can be used in code that requires
  * compilation-related definitions specific to a
@@ -6,4 +6,4 @@
  * version checking should be done based on the
  * string returned by TIFFGetVersion.
  */
-#define TIFFLIB_VERSION 20150830
+#define TIFFLIB_VERSION 20150912