*** 8.5.8 TAGGED FOR RELEASE ***

        * generic/tk.h:         Bump to 8.5.8 for release.
        * library/tk.tcl:
        * unix/configure.in:
        * unix/tk.spec:
        * win/configure.in:
        * README:

        * unix/configure:       autoconf-2.59
        * win/configure:

        * changes:      Updated for 8.5.8 release.

10 files changed, 77 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 3090027..b06d269 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-03  Don Porter  <dgp@users.sourceforge.net>
+
+	*** 8.5.8 TAGGED FOR RELEASE ***
+
+	* generic/tk.h:		Bump to 8.5.8 for release.
+	* library/tk.tcl:
+	* unix/configure.in:
+	* unix/tk.spec:
+	* win/configure.in:
+	* README:
+
+	* unix/configure:	autoconf-2.59
+	* win/configure:
+
+	* changes:	Updated for 8.5.8 release.
+
 2009-11-01  Joe Mistachkin  <joe@mistachkin.com>
 
 	* win/tkWinButton.c: [Bug 1739613]: The default width being stored
diff --git a/README b/README
index 3138000..585352d 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 README:  Tk
-    This is the Tk 8.5.7 source distribution.
+    This is the Tk 8.5.8 source distribution.
     Tcl/Tk is also available through NetCVS:
 	http://tcl.sourceforge.net/
     You can get any source release of Tcl from the file distributions
     link at the above URL.
 
-RCS: @(#) $Id: README,v 1.53.2.6 2009/04/10 18:13:05 dgp Exp $
+RCS: @(#) $Id: README,v 1.53.2.7 2009/11/03 20:15:24 dgp Exp $
 
 1. Introduction
 ---------------
diff --git a/changes b/changes
index 0c0df81..a0eb85b 100644
--- a/changes
+++ b/changes
@@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was
 released on March 13, 1991.  Changes that aren't backward compatible
 are marked specially.
 
-RCS: @(#) $Id: changes,v 1.130.2.13 2009/10/05 15:21:20 dgp Exp $
+RCS: @(#) $Id: changes,v 1.130.2.14 2009/11/03 20:15:24 dgp Exp $
 
 3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from
 the interpreter when the main window is deleted (otherwise there will
@@ -6604,17 +6604,17 @@ in screen distances, reducing precision loss (ferrieux)
 
 --- Released 8.5.7, April 15, 2009 --- See ChangeLog for details ---
 
-2009-04-23 (bug fix)[2779910] (hobbs)
+2009-04-23 (bug fix)[2779910] updated Win chooseDir (hobbs)
 
 2009-04-43 (bug fix) prevent delete of selected folder in Win dialog (hobbs)
 
-2009-04-30 (bug fix)[2080533] (fellows)
+2009-04-30 (bug fix)[2080533] panedwindow sash draw crash (fellows)
 
-2009-04-30 (bug fix)[2504402] (mcdonald,thoyts)
+2009-04-30 (bug fix)[2504402] iconphoto on non-32-bit displays (mcdonald,thoyts)
 
-2009-05-03 (bug fix)[2785744] (fellows)
+2009-05-03 (bug fix)[2785744] broken flag twiddling (baker,fellows)
 
-2009-05-13 (bug fix)[2791352] (thoyts)
+2009-05-13 (bug fix)[2791352] XLFD parsing error (thoyts)
 
 2009-05-14 (new feature) Vista theme support (thoyts)
 
@@ -6626,24 +6626,48 @@ in screen distances, reducing precision loss (ferrieux)
 
 2009-06-23 (bug fix)[220935] canvas dash update problem (nijtmans)
 
-2009-07-15 (bug fix)[2821962] (fellows)
+2009-07-15 (bug fix)[2821962] photo image copy/paste (rib,fellows)
 
-2009-07-22 (bug fix)[2496114] (fellows)
+2009-07-22 (bug fix)[2496114] focus in dead window crash (griffin,fellows)
 
-2009-08-01 (bug fix)[2830420] (fellows)
+2009-08-01 (bug fix)[2830420] X iconphoto for big endian (misch,fellows)
 
 2009-08-04 (bug fix) [text] word-wrap of non-breaking space (fellows)
 
 2009-08-24 (bug fix) tk::MessageBox bindings for ttk::buttons (steiner,fellows)
 
-2009-08-25 (bug fix)[1909931] (fellows)
+2009-08-25 (bug fix)[1909931] [send] update for Fedora 8 (fellows)
 
-2009-09-10 (bug fix) (berezhnoy,fellows)
+2009-09-10 (bug fix) font allocation crash (berezhnoy,fellows)
 
-2009-09-14 (bug fix)[873608] (hobbs)
+2009-09-14 (bug fix)[873608] win tearoff menu, no submenu arrows (traum,hobbs)
 
-2009-09-14 (bug fix)[873613] (hobbs)
+2009-09-14 (bug fix)[873613] win tearoff menu repeat select (traum,hobbs)
 
 2009-09-25 (bug fix) grayscale from images (vetter,fellows)
 
---- Released 8.5.8, October xx, 2009 --- See ChangeLog for details ---
+2009-10-07 (bug fix)[2088597] min scrollbar slider size (danckaert,fellows)
+
+2009-10-07 (bug fix)[2787164] combobox/menubutton arrow size (thoyts)
+
+2009-10-08 (bug fix)[2870648] file dialog cursor (danckaert,fellows)
+
+2009-10-10 (feature)[1961455] underline, overstrike Xft fonts (caffin,fellows)
+
+2009-10-15 (feature)[2794032] permit [load] into Tcl 8.6+ interps (porter)
+
+2009-10-22 (bug fix)[2168768] file dialog -typevariable scope (danckaert)
+
+2009-10-22 (bug fix)[1469210] [text] modified error (danckaert)
+
+2009-10-24 (bug fix)[2883712] 64-bit Aqua progress bar (haffner)
+
+2009-10-24 (bug fix)[1530276] X checkbutton -selectcolor (danckaert)
+
+2009-10-25 (bug fix)[1854913] [.t delete] before -startindex (danckaert)
+
+2009-10-25 (bug fix)[2809525] prevent X crash on overlong color name (goth)
+
+2009-10-29 (bug fix)[1825353] Russian Windows tiny fonts problem (thoyts)
+
+--- Released 8.5.8, November xx, 2009 --- See ChangeLog for details ---
diff --git a/generic/tk.h b/generic/tk.h
index d885af4..84d0b38 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tk.h,v 1.109.2.11 2009/04/10 18:13:05 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.109.2.12 2009/11/03 20:15:25 dgp Exp $
  */
 
 #ifndef _TK
@@ -53,10 +53,10 @@ extern "C" {
 #define TK_MAJOR_VERSION	8
 #define TK_MINOR_VERSION	5
 #define TK_RELEASE_LEVEL	TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL	7
+#define TK_RELEASE_SERIAL	8
 
 #define TK_VERSION		"8.5"
-#define TK_PATCH_LEVEL		"8.5.7"
+#define TK_PATCH_LEVEL		"8.5.8"
 
 /*
  * A special definition used to allow this header file to be included from
diff --git a/library/tk.tcl b/library/tk.tcl
index a2fb11c..b4ae238 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -3,7 +3,7 @@
 # Initialization script normally executed in the interpreter for each
 # Tk-based application.  Arranges class bindings for widgets.
 #
-# RCS: @(#) $Id: tk.tcl,v 1.73.2.11 2009/10/15 17:48:50 dgp Exp $
+# RCS: @(#) $Id: tk.tcl,v 1.73.2.12 2009/11/03 20:15:25 dgp Exp $
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -17,7 +17,7 @@ package require Tcl 8.5	;# Guard against [source] in an 8.4- interp
 # 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.7
+package require -exact Tk  8.5.8
 
 # Create a ::tk namespace
 namespace eval ::tk {
diff --git a/unix/configure b/unix/configure
index 458ed16..200d652 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=".7"
+TK_PATCH_LEVEL=".8"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
@@ -9906,7 +9906,7 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9914,7 +9914,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9941,7 +9941,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -9955,18 +9955,18 @@ if test "$ac_x_libraries" = no; then
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
-  LIBS="-lXt $LIBS"
+  LIBS="-lX11 $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 int
 main ()
 {
-XtMalloc (0)
+XrmInitialize ()
   ;
   return 0;
 }
diff --git a/unix/configure.in b/unix/configure.in
index 77c48b1..4228d55 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.153.2.10 2009/07/14 08:29:37 dkf Exp $
+# RCS: @(#) $Id: configure.in,v 1.153.2.11 2009/11/03 20:15:25 dgp Exp $
 
 AC_INIT([tk],[8.5])
 AC_PREREQ(2.59)
@@ -27,7 +27,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".7"
+TK_PATCH_LEVEL=".8"
 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 f05e6bb..75990b9 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -1,19 +1,19 @@
-# $Id: tk.spec,v 1.34.2.8 2009/04/10 18:13:06 dgp Exp $
+# $Id: tk.spec,v 1.34.2.9 2009/11/03 20:15:25 dgp Exp $
 # This file is the basis for a binary Tk Linux RPM.
 
 %{!?directory:%define directory /usr/local}
 
 Name:          tk
 Summary:       Tk graphical toolkit for the Tcl scripting language.
-Version:       8.5.7
+Version:       8.5.8
 Release:       2
 License:       BSD
 Group:         Development/Languages
 Source:        http://prdownloads.sourceforge.net/tcl/tk%{version}-src.tar.gz
 URL:           http://www.tcl.tk/
 Buildroot:     /var/tmp/%{name}%{version}
-Buildrequires: XFree86-devel tcl = %version
-Requires:      tcl = %version
+Buildrequires: XFree86-devel tcl >= 8.5.0
+Requires:      tcl >= 8.5.0
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
diff --git a/win/configure b/win/configure
index 33dc5b7..715f0af 100755
--- a/win/configure
+++ b/win/configure
@@ -1309,7 +1309,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".7"
+TK_PATCH_LEVEL=".8"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index 9a143bb..281685b 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tk installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.77.2.11 2009/04/10 18:13:06 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.77.2.12 2009/11/03 20:15:25 dgp Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.59)
@@ -16,7 +16,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".7"
+TK_PATCH_LEVEL=".8"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------