merge release to dev

11 files changed, 28 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 06b562b..5127d2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2011-11-04  Don Porter  <dgp@users.sourceforge.net>
+
+	*** 8.5.11 TAGGED FOR RELEASE ***
+
+	* generic/tcl.h:	Bump to 8.5.11 for release.
+	* library/init.tcl:
+	* tools/tcl.wse.in:
+	* unix/configure.in:
+	* unix/tcl.spec:
+	* win/configure.in:
+	* README:
+
+	* unix/configure:	autoconf-2.59
+	* win/configure:
+
+	* changes:	Update for 8.5.11 release.
+
 2011-10-20  Don Porter  <dgp@users.sourceforge.net>
 
 	* library/http/http.tcl:	Bump to version 2.7.7
diff --git a/README b/README
index de3e9e4..b3bbc2e 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 README:  Tcl
-    This is the Tcl 8.5.10 source distribution.
+    This is the Tcl 8.5.11 source distribution.
 	http://tcl.sourceforge.net/
     You can get any source release of Tcl from the file distributions
     link at the above URL.
diff --git a/changes b/changes
index e9823d2..91f036b 100644
--- a/changes
+++ b/changes
@@ -7579,4 +7579,4 @@ like "nano()" instead of parsing as "nan o()" with missing op (duquette,porter)
 
 2011-10-15 tzdata updated to Olson's tzdata2011l (iyer)
 
---- Released 8.5.11, November 1, 2011 --- See ChangeLog for details ---
+--- Released 8.5.11, November 4, 2011 --- See ChangeLog for details ---
diff --git a/generic/tcl.h b/generic/tcl.h
index 51e3ce3..e5e38a8 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -58,10 +58,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   5
 #define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  10
+#define TCL_RELEASE_SERIAL  11
 
 #define TCL_VERSION	    "8.5"
-#define TCL_PATCH_LEVEL	    "8.5.10"
+#define TCL_PATCH_LEVEL	    "8.5.11"
 
 /*
  * The following definitions set up the proper options for Windows compilers.
diff --git a/library/init.tcl b/library/init.tcl
index 1dd5881..389f319 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -15,7 +15,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.5.10
+package require -exact Tcl 8.5.11
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index 57dfc52..69690a8 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -12,7 +12,7 @@ item: Global
   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8
-  Disk Label=tcl8.5.10
+  Disk Label=tcl8.5.11
   Disk Filename=setup
   Patch Flags=0000000000000001
   Patch Threshold=85
diff --git a/unix/configure b/unix/configure
index aa792a7..2ba3d68 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1335,7 +1335,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".10"
+TCL_PATCH_LEVEL=".11"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/configure.in b/unix/configure.in
index 3394369..a30c2b4 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".10"
+TCL_PATCH_LEVEL=".11"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/tcl.spec b/unix/tcl.spec
index 7729960..a91a53b 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -4,7 +4,7 @@
 
 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.5.10
+Version:       8.5.11
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/win/configure b/win/configure
index 7ff7248..0e5e92f 100755
--- a/win/configure
+++ b/win/configure
@@ -1311,7 +1311,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".10"
+TCL_PATCH_LEVEL=".11"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3
diff --git a/win/configure.in b/win/configure.in
index 791d96a..306dbac 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -14,7 +14,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".10"
+TCL_PATCH_LEVEL=".11"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3