summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--RELEASE-DATE2
-rw-r--r--VERSION2
-rwxr-xr-xconfigure24
-rw-r--r--configure.ac6
-rw-r--r--html/Makefile.am3
-rw-r--r--html/Makefile.in3
-rw-r--r--html/index.html4
-rw-r--r--libtiff/tiffvers.h4
9 files changed, 27 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ac633d5..29df3eac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2015-06-21 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+ * libtiff 4.0.4 released.
+
* configure.ac: Add a HAVE_FOO Automake conditional for each
add-on library.
diff --git a/RELEASE-DATE b/RELEASE-DATE
index 703726c0..b89e3bd2 100644
--- a/RELEASE-DATE
+++ b/RELEASE-DATE
@@ -1 +1 @@
-20150126
+20150621
diff --git a/VERSION b/VERSION
index 3b5886df..c5106e6d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.4beta
+4.0.4
diff --git a/configure b/configure
index da03404e..638fc53b 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.69 for LibTIFF Software 4.0.4beta.
+# Generated by GNU Autoconf 2.69 for LibTIFF Software 4.0.4.
#
# Report bugs to <tiff@lists.maptools.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='LibTIFF Software'
PACKAGE_TARNAME='tiff'
-PACKAGE_VERSION='4.0.4beta'
-PACKAGE_STRING='LibTIFF Software 4.0.4beta'
+PACKAGE_VERSION='4.0.4'
+PACKAGE_STRING='LibTIFF Software 4.0.4'
PACKAGE_BUGREPORT='tiff@lists.maptools.org'
PACKAGE_URL=''
@@ -1405,7 +1405,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 4.0.4beta to adapt to many kinds of systems.
+\`configure' configures LibTIFF Software 4.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1479,7 +1479,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of LibTIFF Software 4.0.4beta:";;
+ short | recursive ) echo "Configuration of LibTIFF Software 4.0.4:";;
esac
cat <<\_ACEOF
@@ -1663,7 +1663,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-LibTIFF Software configure 4.0.4beta
+LibTIFF Software configure 4.0.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2436,7 +2436,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 4.0.4beta, which was
+It was created by LibTIFF Software $as_me 4.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3379,7 +3379,7 @@ fi
# Define the identity of the package.
PACKAGE='tiff'
- VERSION='4.0.4beta'
+ VERSION='4.0.4'
cat >>confdefs.h <<_ACEOF
@@ -3499,12 +3499,12 @@ fi
LIBTIFF_MAJOR_VERSION=4
LIBTIFF_MINOR_VERSION=0
LIBTIFF_MICRO_VERSION=4
-LIBTIFF_ALPHA_VERSION=beta
+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=1
+LIBTIFF_REVISION=2
LIBTIFF_AGE=2
LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE
@@ -21250,7 +21250,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 4.0.4beta, which was
+This file was extended by LibTIFF Software $as_me 4.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21316,7 +21316,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-LibTIFF Software config.status 4.0.4beta
+LibTIFF Software config.status 4.0.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 5448dc07..7ba14ee9 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],[4.0.4beta],[tiff@lists.maptools.org],[tiff])
+AC_INIT([LibTIFF Software],[4.0.4],[tiff@lists.maptools.org],[tiff])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(m4)
AC_LANG(C)
@@ -42,7 +42,7 @@ dnl Don't fill the ALPHA_VERSION field, if not applicable.
LIBTIFF_MAJOR_VERSION=4
LIBTIFF_MINOR_VERSION=0
LIBTIFF_MICRO_VERSION=4
-LIBTIFF_ALPHA_VERSION=beta
+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
LIBTIFF_RELEASE_DATE=`date +"%Y%m%d"`
@@ -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=1
+LIBTIFF_REVISION=2
LIBTIFF_AGE=2
LIBTIFF_VERSION_INFO=$LIBTIFF_CURRENT:$LIBTIFF_REVISION:$LIBTIFF_AGE
diff --git a/html/Makefile.am b/html/Makefile.am
index aa6a5ddf..99f5bdef 100644
--- a/html/Makefile.am
+++ b/html/Makefile.am
@@ -80,7 +80,8 @@ docfiles = \
v4.0.1.html \
v4.0.2.html \
v4.0.3.html \
- v4.0.4beta.html
+ v4.0.4beta.html \
+ v4.0.4.html
dist_doc_DATA = $(docfiles)
diff --git a/html/Makefile.in b/html/Makefile.in
index 03169ecc..45811c40 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -441,7 +441,8 @@ docfiles = \
v4.0.1.html \
v4.0.2.html \
v4.0.3.html \
- v4.0.4beta.html
+ v4.0.4beta.html \
+ v4.0.4.html
dist_doc_DATA = $(docfiles)
SUBDIRS = images man
diff --git a/html/index.html b/html/index.html
index 31b5b40c..2c038d64 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.4beta.html">v4.0.4beta</a></td>
+ <td><a href="v4.0.4.html">v4.0.4</a></td>
</tr>
<tr>
<th>Master Download Site</th>
@@ -117,7 +117,7 @@
</ul>
<hr>
<p>
- Last updated $Date: 2015-01-26 12:24:12 $.
+ Last updated $Date: 2015-06-21 19:13:04 $.
</p>
</body>
</html>
diff --git a/libtiff/tiffvers.h b/libtiff/tiffvers.h
index 74f769c4..1ed5b8f3 100644
--- a/libtiff/tiffvers.h
+++ b/libtiff/tiffvers.h
@@ -1,4 +1,4 @@
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.4beta\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
+#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.4\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 20150126
+#define TIFFLIB_VERSION 20150621