merge release

11 files changed, 79 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index fd34f0b..7eb5433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+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 Tk 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>
+
+	*** 8.6.1 TAGGED FOR RELEASE ***
+
+	* README:		Bump version number to 8.6.1
+	* generic/tk.h:
+	* library/tk.tcl:
+	* unix/configure.in:
+	* unix/tk.spec:
+	* win/configure.in:
+
+	* 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 c8688cb..a76148f 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 README:  Tk
-    This is the Tk 8.6.0 source distribution.
+    This is the Tk 8.6.1 source distribution.
 	http://sourceforge.net/projects/tcl/files/Tcl/
     You can get any source release of Tk from the URL above.
 
diff --git a/changes b/changes
index b7dc763..3ddc4f9 100644
--- a/changes
+++ b/changes
@@ -7031,3 +7031,45 @@ Many revisions to better support a Cygwin environment (nijtmans)
 2012-12-06 (bug fix)[3592736] stop pink greys from buggy mingw builds (fellows)
 
 --- Released 8.6.0, December 20, 2012 --- See ChangeLog for details ---
+
+2013-01-04 (bug fix) Tk_InitStubs("8.6") rejected in 8.60 interp (nijtmans)
+
+2013-01-10 (bug fix)[3600251] Mac <Control-v> binding (kjnash,nijtmans)
+
+2013-01-10 (bug fix)[3600260] <<SelectNextPara>> binding (kjnash,nijtmans)
+
+2013-01-13 (bug fix)[3600290] restore $tk_strictMotif respect (kjnash,nijtmans)
+
+2013-01-22 (bug fix)[3601782] Tcl_InitStubs failure message (nijtmans)
+
+2013-01-31 (bug fix)[3599928] use XKeycodeToKeysym on old systems (cassoff)
+
+2013-02-04 (bug fix)[3603077] treeview update on tag add/remove (english)
+
+2013-02-28 (bug fix)[3599312] First Alt key event is lost (mcdonald)
+
+2013-03-11 (bug fix)[3607326] Crash [listbox .l -listvariable $array] (porter)
+
+2013-03-13 (enhancement) better build support for Debian arch (shadura)
+
+2013-03-27 (bug fix)[3608074] button, listbox, menu <<Invoke>> (nijtmans)
+
+2013-04-01 (bug fix)[3607830] Xkb runtime checks (griffin)
+
+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-28 (bug fix)[2501278] reverse ttk::scale key bindings {mcdonald)
+
+2013-07-02 (bug fix)[32afa6] corrected dirent64 check (griffin)
+
+2013-08-14 (bug fix)[069c9e] "option" value refcount crash (tim,nijtmans)
+
+2013-08-15 (bug fix)[c597acd] [$pb step] work with traces (english)
+
+2013-08-25 (bug fix)[3016181] Cocoa: [destroy $scrollbar] => crash (goddard)
+
+--- Released 8.6.1, September 19, 2013 --- http://core.tcl.tk/tk/ for details
diff --git a/generic/tk.h b/generic/tk.h
index aa9cd22..088f4be 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -78,7 +78,7 @@ extern "C" {
 #define TK_RELEASE_SERIAL	0
 
 #define TK_VERSION		"8.6"
-#define TK_PATCH_LEVEL		"8.6.0"
+#define TK_PATCH_LEVEL		"8.6.1"
 
 /*
  * A special definition used to allow this header file to be included from
diff --git a/library/tk.tcl b/library/tk.tcl
index 06902f9..c490797 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -13,7 +13,7 @@
 # Insist on running with compatible version of Tcl
 package require Tcl 8.6
 # Verify that we have Tk binary and script components from the same release
-package require -exact Tk  8.6.0
+package require -exact Tk  8.6.1
 
 # Create a ::tk namespace
 namespace eval ::tk {
diff --git a/unix/configure b/unix/configure
index 2683a29..485b70a 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1338,7 +1338,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TK_VERSION=8.6
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=6
-TK_PATCH_LEVEL=".0"
+TK_PATCH_LEVEL=".1"
 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/configure.in b/unix/configure.in
index 98b9e0a..e7bf023 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TK_VERSION=8.6
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=6
-TK_PATCH_LEVEL=".0"
+TK_PATCH_LEVEL=".1"
 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 823b44b..cafad27 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.6.0
+Version:       8.6.1
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index 575f36c..392566b 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -40,6 +40,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
+
 /* Define to 1 if you have the `pthread_attr_setstacksize' function. */
 #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
 
@@ -196,6 +199,9 @@
 # endif
 #endif
 
+/* Is XKeycodeToKeysym deprecated? */
+#undef XKEYCODETOKEYSYM_IS_DEPRECATED
+
 /* Are Darwin SUSv3 extensions available? */
 #undef _DARWIN_C_SOURCE
 
diff --git a/win/configure b/win/configure
index 9efd2a9..807e1ae 100755
--- a/win/configure
+++ b/win/configure
@@ -1312,7 +1312,7 @@ SHELL=/bin/sh
 TK_VERSION=8.6
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=6
-TK_PATCH_LEVEL=".0"
+TK_PATCH_LEVEL=".1"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index 709e64e..4f446e0 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -14,7 +14,7 @@ SHELL=/bin/sh
 TK_VERSION=8.6
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=6
-TK_PATCH_LEVEL=".0"
+TK_PATCH_LEVEL=".1"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------