merge release

11 files changed, 58 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 88f14ae..44b0198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+A NOTE ON THE CHANGELOG:
+Starting in early 2011, Tk source code has been under the management of
+fossil, hosted at http://core.tcl.tk/tk/ .  Fossil presents a "Timeline"
+view of changes made that is superior in every way to a hand edited log file.
+Because of this, many Tcl developers are now out of the habit of maintaining
+this log file.  You may still find useful things in it, but the Timeline is
+a better first place to look now.
+============================================================================
+
+2013-08-30  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tk.h:		Bump to 8.5.15 for release.
+	* library/tk.tcl:
+	* unix/configure.in:
+	* unix/tk.spec:
+	* win/configure.in:
+	* README:
+
+	* unix/configure:	autoconf-2.59
+	* win/configure:
+
 2013-08-25   Kevin Walzer <wordtech@users.sourceforge.net>
 
 	* macosx/tkMacOSXButton.c:  Bug [3016181]: Crash after scrollbar
diff --git a/README b/README
index 4beaffa..5a0d9bd 100644
--- a/README
+++ b/README
@@ -1,13 +1,13 @@
 README:  Tk
-    This is the Tk 8.5.14 source distribution.
+    This is the Tk 8.5.15 source distribution.
 	http://sourceforge.net/projects/tcl/files/Tcl/
     You can get any source release of Tk from the URL above.
 
 1. Introduction
 ---------------
 
-This directory contains the sources and documentation for Tk, an X11
-toolkit implemented with the Tcl scripting language.
+This directory contains the sources and documentation for Tk, a
+cross-platform GUI toolkit implemented with the Tcl scripting language.
 
 For details on features, incompatibilities, and potential problems with
 this release, see the Tcl/Tk 8.5 Web page at
diff --git a/changes b/changes
index ea78d52..45768e4 100644
--- a/changes
+++ b/changes
@@ -6889,3 +6889,25 @@ Many revisions to better support a Cygwin environment (nijtmans)
 2013-04-01 (bug fix)[3607830] Xkb runtime checks (griffin)
 
 --- Released 8.5.14, April 3, 2013 --- See ChangeLog for details ---
+
+2013-05-19 (platform support) FreeBSD updates (cerutti)
+
+2013-06-05 (bug fix)[3613759] [ttk::entry .e; .e xview end] (nijtmans)
+
+2013-06-05 (bug fix)[2100430] [ttk::entry .e; .e xview insert] (nijtmans)
+
+2013-06-07 (bug fix)[1913750,3500545,3416492,3095112] file dialogs (nijtmans)
+
+2013-06-28 (bug fix)[2501278] reverse ttk::scale key bindings {mcdonald)
+
+2013-06-28 (bug fix)[3588364] crash loading Tk 64-bit windows (nijtmans)
+
+2013-07-02 (bug fix)[32afa6] corrected dirent64 check (griffin)
+
+2013-08-25 (bug fix)[3016181] Cocoa: [destroy $scrollbar] => crash (goddard)
+
+2013-08-26 (bug fix)[c597acd] [$pb step] work with traces (english)
+
+2013-09-15 (bug fix)[8eb5671] macosx Tk compile errors w/clang (deily)
+
+--- Released 8.5.15, September 18, 2013 --- http://core.tcl.tk/tk/ for details
diff --git a/generic/tk.h b/generic/tk.h
index ca66ceb..6c2c7b1 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -59,10 +59,10 @@ extern "C" {
 #define TK_MAJOR_VERSION	8
 #define TK_MINOR_VERSION	5
 #define TK_RELEASE_LEVEL	TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL	14
+#define TK_RELEASE_SERIAL	15
 
 #define TK_VERSION		"8.5"
-#define TK_PATCH_LEVEL		"8.5.14"
+#define TK_PATCH_LEVEL		"8.5.15"
 
 /*
  * A special definition used to allow this header file to be included from
diff --git a/library/tk.tcl b/library/tk.tcl
index 7c6bb1a..f432861 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -15,7 +15,7 @@ package require Tcl 8.5	;# Guard against [source] in an 8.4- interp before
 # Insist on running with compatible version of Tcl
 package require Tcl 8.5.0
 # Verify that we have Tk binary and script components from the same release
-package require -exact Tk  8.5.14
+package require -exact Tk  8.5.15
 
 # Create a ::tk namespace
 namespace eval ::tk {
diff --git a/unix/configure b/unix/configure
index a7d80a6..654b67d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1338,7 +1338,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".14"
+TK_PATCH_LEVEL=".15"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
@@ -3962,6 +3962,7 @@ echo "$as_me: WARNING: Don't know how to find pthread lib on your system - you m
 	ac_saved_libs=$LIBS
 	LIBS="$LIBS $THREADS_LIBS"
 
+
 for ac_func in pthread_attr_setstacksize pthread_atfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/unix/configure.in b/unix/configure.in
index 3d1e32b..fd817aa 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".14"
+TK_PATCH_LEVEL=".15"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
diff --git a/unix/tk.spec b/unix/tk.spec
index 6884100..9302fd4 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -4,7 +4,7 @@
 
 Name:          tk
 Summary:       Tk graphical toolkit for the Tcl scripting language.
-Version:       8.5.14
+Version:       8.5.15
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index 986609b..732bf94 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -43,6 +43,9 @@
 /* Define to 1 if you have the `open64' function. */
 #undef HAVE_OPEN64
 
+/* Define to 1 if you have the `pthread_atfork' function. */
+#undef HAVE_PTHREAD_ATFORK
+
 /* Do we want a BSD-like thread-attribute interface? */
 #undef HAVE_PTHREAD_ATTR_GET_NP
 
diff --git a/win/configure b/win/configure
index 6415981..b53481f 100755
--- a/win/configure
+++ b/win/configure
@@ -1312,7 +1312,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".14"
+TK_PATCH_LEVEL=".15"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index c0a9599..7eeaf97 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -14,7 +14,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".14"
+TK_PATCH_LEVEL=".15"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------