https://github.com/libsdl-org/libtiff/commit/edc9963e946137e5dd4130f2d5eb1d7efa48483b
From edc9963e946137e5dd4130f2d5eb1d7efa48483b Mon Sep 17 00:00:00 2001
From: Bob Friesenhahn <[EMAIL REDACTED]>
Date: Fri, 28 Aug 2009 18:48:59 +0000
Subject: [PATCH] * libtiff 3.9.1 released.
---
ChangeLog | 4 ++
HOWTO-RELEASE | 106 ++++++++++++++++++++++++----------
RELEASE-DATE | 2 +-
VERSION | 2 +-
build/Makefile.in | 2 +-
configure | 22 +++----
configure.ac | 4 +-
contrib/dbs/xtiff/Makefile.in | 2 +-
html/Makefile.in | 2 +-
html/v3.9.1.html | 9 ++-
libtiff/tiffvers.h | 4 +-
11 files changed, 105 insertions(+), 54 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cd3ac85e..606ec5a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-28 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * libtiff 3.9.1 released.
+
2009-08-28 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tif_dirwrite.c: Back out changes from 2007-11-22 that
diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
index 23aae5a5..d6035a5c 100644
--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -1,57 +1,105 @@
HOWTO-RELEASE:
-Notes on releasing. You will need appropriate autoconf, automake and libtool
-utilities to release a package.
+Notes on releasing.
-1. Commit any unsaved changes.
+0. Make sure that you have current FSF releases of autoconf, automake,
+ and libtool packages installed under a common installation prefix
+ and that these tools are in your executable search path prior to
+ any other installed versions. Versions delivered with Linux may be
+ altered so it is best to install official FSF releases. GNU 'm4'
+ 1.4.6 or later is needed in order to avoid bugs in m4. These
+ packages may be downloaded from the following ftp locations:
+
+ autoconf - ftp://ftp.gnu.org/pub/gnu/autoconf
+ automake - ftp://ftp.gnu.org/pub/gnu/automake
+ libtool - ftp://ftp.gnu.org/pub/gnu/libtool
-2. "make clean"
+ Release builds should only be done on a system with a functioning
+ and correctly set system clock and on a filesystem which accurately
+ records file update times. Use of GNU make is recommended.
-3. Create html/vX.X.html. Take ChangeLog entries and html-ify in there.
+1. Commit any unsaved changes.
+
+2. Create html/vX.X.html. Take ChangeLog entries and html-ify in there.
Easist thing to do is take html/vX.(X-1).html and use it as a template.
Add that file to the list of EXTRA_DIST files in the html/Makefile.am.
-3.5. Update html/index.html to refer to this new page as the current release.
+3. Update html/index.html to refer to this new page as the current release.
-4. Increment version in configure.ac. Put 'alpha' or 'beta' after
- the version, if applicable.
+4. Increment the release version in configure.ac. Put 'alpha' or
+ 'beta' after the version, if applicable. For example:
- eg.
- 3.5.7
- or
- 3.5.8beta
+ 3.9.1
+ or
+ 3.9.1beta
Version should be updated in two places: in the second argument of the
AC_INIT macro and in LIBTIFF_xxx_VERSION variables.
-5. ./autogen.sh
+5. Add an entry to Changelog similar to:
+
+ * libtiff 3.9.1 released.
+
+6. In the source tree do
+
+ ./autogen.sh
+
+ This step may be skipped if you have already been using a
+ maintainer build with current autoconf, automake, and libtool
+ packages. It is only needed when updating tool versions.
+
+7. 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:
-6. sh configure
+ mkdir libtiff-build
+ cd libtiff-build
+ /path/to/libtiff/configure --enable-maintainer-mode
-7. make release -- this will update "RELEASE-DATE" and "VERSION" in the top
- level dir, and libtiff/tiffvers.h.
+ otherwise do
-8. Please verify that the version info in RELEASE-DATE, VERSION and
- libtiff/tiffvers.h is right.
+ ./configure --enable-maintainer-mode
-9. make; make distcheck (to test).
+8. In the build tree do
-10. make distclean
+ make release
-11. cvs commit
+ This will update "RELEASE-DATE", "VERSION", and libtiff/tiffvers.h
+ in the source tree.
-12. cvs tag Release-v3-5-7 (or the appropriate name for the release)
+9. In the source tree, verify that the version info in RELEASE-DATE,
+ VERSION and libtiff/tiffvers.h is right.
+
+10. In the build tree do
+
+ make
+ make distcheck
+
+ If 'make distcheck' fails, then correct any issues until it
+ succeeds.
-13. configure; make dist
Two files with names tiff-version.tar.gz and tiff-version.zip will
- be created in the top level package directory.
+ be created in the top level build directory.
+
+11. In the source tree do
+
+ 'cvs commit'.
+
+12. In the source tree do
+
+ cvs tag Release-v3-9-1
+
+ (or the appropriate name for the release)
+
+13. Copy release packages from the build tree to the
+ ftp.remotesensing.org ftp site.
-14. Copy to ftp.remotesensing.org ftp site.
- scp tiff-*.tar.gz tiff-*.zip \
- frankw@upload.osgeo.org:/osgeo/download/libtiff
+ scp tiff-*.tar.gz tiff-*.zip \
+ frankw@upload.osgeo.org:/osgeo/download/libtiff
-15. Announce to list, tiff@lists.maptools.org
+14. Announce to list, tiff@lists.maptools.org
-16. Update libtiff page on freshmeat with new version announcement.
+15. Update libtiff page on freshmeat with new version announcement.
diff --git a/RELEASE-DATE b/RELEASE-DATE
index 8c14d22f..ea77a5bf 100644
--- a/RELEASE-DATE
+++ b/RELEASE-DATE
@@ -1 +1 @@
-20090820
+20090828
diff --git a/VERSION b/VERSION
index a5c4c763..6bd10744 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.9.0
+3.9.1
diff --git a/build/Makefile.in b/build/Makefile.in
index ca630b9d..f67b1dc3 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.1.2.8 2009-08-20 22:31:00 bfriesen Exp $
+# $Id: Makefile.in,v 1.1.2.9 2009-08-28 18:49:02 bfriesen Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/configure b/configure
index 76887024..4129015e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for LibTIFF Software 3.9.0.
+# Generated by GNU Autoconf 2.64 for LibTIFF Software 3.9.1.
#
# Report bugs to <tiff@lists.maptools.org>.
#
@@ -698,8 +698,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='LibTIFF Software'
PACKAGE_TARNAME='tiff'
-PACKAGE_VERSION='3.9.0'
-PACKAGE_STRING='LibTIFF Software 3.9.0'
+PACKAGE_VERSION='3.9.1'
+PACKAGE_STRING='LibTIFF Software 3.9.1'
PACKAGE_BUGREPORT='tiff@lists.maptools.org'
PACKAGE_URL=''
@@ -1492,7 +1492,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures LibTIFF Software 3.9.0 to adapt to many kinds of systems.
+\`configure' configures LibTIFF Software 3.9.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1567,7 +1567,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of LibTIFF Software 3.9.0:";;
+ short | recursive ) echo "Configuration of LibTIFF Software 3.9.1:";;
esac
cat <<\_ACEOF
@@ -1725,7 +1725,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-LibTIFF Software configure 3.9.0
+LibTIFF Software configure 3.9.1
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2449,7 +2449,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by LibTIFF Software $as_me 3.9.0, which was
+It was created by LibTIFF Software $as_me 3.9.1, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -3376,7 +3376,7 @@ fi
# Define the identity of the package.
PACKAGE='tiff'
- VERSION='3.9.0'
+ VERSION='3.9.1'
cat >>confdefs.h <<_ACEOF
@@ -3442,7 +3442,7 @@ fi
LIBTIFF_MAJOR_VERSION=3
LIBTIFF_MINOR_VERSION=9
-LIBTIFF_MICRO_VERSION=0
+LIBTIFF_MICRO_VERSION=1
LIBTIFF_ALPHA_VERSION=
LIBTIFF_VERSION=$LIBTIFF_MAJOR_VERSION.$LIBTIFF_MINOR_VERSION.$LIBTIFF_MICRO_VERSION$LIBTIFF_ALPHA_VERSION
LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"`
@@ -19062,7 +19062,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by LibTIFF Software $as_me 3.9.0, which was
+This file was extended by LibTIFF Software $as_me 3.9.1, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19126,7 +19126,7 @@ Report bugs to <tiff@lists.maptools.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-LibTIFF Software config.status 3.9.0
+LibTIFF Software config.status 3.9.1
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 28639a3e..fa02fa9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl OF THIS SOFTWARE.
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.64)
-AC_INIT([LibTIFF Software],[3.9.0],[tiff@lists.maptools.org],[tiff])
+AC_INIT([LibTIFF Software],[3.9.1],[tiff@lists.maptools.org],[tiff])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(m4)
AC_LANG(C)
@@ -41,7 +41,7 @@ dnl Versioning.
dnl Don't fill the ALPHA_VERSION field, if not applicable.
LIBTIFF_MAJOR_VERSION=3
LIBTIFF_MINOR_VERSION=9
-LIBTIFF_MICRO_VERSION=0
+LIBTIFF_MICRO_VERSION=1
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
diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in
index a67e227a..431b0fd4 100644
--- a/contrib/dbs/xtiff/Makefile.in
+++ b/contrib/dbs/xtiff/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.36.2.8 2009-08-20 22:31:00 bfriesen Exp $
+# $Id: Makefile.in,v 1.36.2.9 2009-08-28 18:49:02 bfriesen Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/html/Makefile.in b/html/Makefile.in
index 9cfc279c..0678cda5 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.49.2.8 2009-08-20 22:31:00 bfriesen Exp $
+# $Id: Makefile.in,v 1.49.2.9 2009-08-28 18:49:02 bfriesen Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/html/v3.9.1.html b/html/v3.9.1.html
index 906a033d..93228483 100644
--- a/html/v3.9.1.html
+++ b/html/v3.9.1.html
@@ -79,10 +79,9 @@
byte-count and strip-offset of zero. This cast was added on
the day of the 3.9.0 release.
- <li> libtiff/tif_dirwrite.c (_TIFFWriteDirectory): Fix for
- "Bug 2088 - _TIFFWriteDirectory do not flush data sometimes".
- This bug also caused libtiff to output a wrong last strip with
- byte-count and strip-offset of zero.
+ <li> libtiff/tif_dirwrite.c: Back out changes from 2007-11-22
+ that resulted in the final strip not being written in some
+ circumstances.
http://bugzilla.maptools.org/show_bug.cgi?id=2088
</UL>
@@ -110,7 +109,7 @@
</UL>
-Last updated $Date: 2009-08-28 16:24:13 $.
+Last updated $Date: 2009-08-28 18:49:02 $.
</BODY>
</HTML>
diff --git a/libtiff/tiffvers.h b/libtiff/tiffvers.h
index aec110dd..c4693f4f 100644
--- a/libtiff/tiffvers.h
+++ b/libtiff/tiffvers.h
@@ -1,4 +1,4 @@
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.0\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.1\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 20090820
+#define TIFFLIB_VERSION 20090828