merge release to dev

10 files changed, 28 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index cd34352..4fc0f18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2011-11-04  Don Porter  <dgp@users.sourceforge.net>
+
+	*** 8.5.11 TAGGED FOR RELEASE ***
+
+	* generic/tk.h:		Bump to 8.5.11 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.11 release.
+
 2011-11-01  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tkObj.c (GetPixelsFromObjEx): [Bug 3431491]: Use a bit of
diff --git a/README b/README
index 64bdebc..bc2a001 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 README:  Tk
-    This is the Tk 8.5.10 source distribution.
+    This is the Tk 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 a6779fc..e3a96be 100644
--- a/changes
+++ b/changes
@@ -6792,4 +6792,6 @@ and -to (porter)
 
 2011-10-25 (bug fix)[3410609] AltGr keysyms on Swiss keyboard (tasser,kenny)
 
---- Released 8.5.11, November 11, 2011 --- See ChangeLog for details ---
+2011-11-02 (performance)[3431491] improved "pixels" shimmer logic (fellows)
+
+--- Released 8.5.11, November 4, 2011 --- See ChangeLog for details ---
diff --git a/generic/tk.h b/generic/tk.h
index 638ec2a..af7b05c 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -51,10 +51,10 @@ extern "C" {
 #define TK_MAJOR_VERSION	8
 #define TK_MINOR_VERSION	5
 #define TK_RELEASE_LEVEL	TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL	10
+#define TK_RELEASE_SERIAL	11
 
 #define TK_VERSION		"8.5"
-#define TK_PATCH_LEVEL		"8.5.10"
+#define TK_PATCH_LEVEL		"8.5.11"
 
 /*
  * A special definition used to allow this header file to be included from
diff --git a/library/tk.tcl b/library/tk.tcl
index 42089ac..8e967cb 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.10
+package require -exact Tk  8.5.11
 
 # Create a ::tk namespace
 namespace eval ::tk {
diff --git a/unix/configure b/unix/configure
index b2b6c8b..a08ada4 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=".10"
+TK_PATCH_LEVEL=".11"
 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 28d1a07..996195e 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=".10"
+TK_PATCH_LEVEL=".11"
 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 0680d85..21a4b7d 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.10
+Version:       8.5.11
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/win/configure b/win/configure
index b3a6294..70b9eca 100755
--- a/win/configure
+++ b/win/configure
@@ -1311,7 +1311,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".10"
+TK_PATCH_LEVEL=".11"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index bb29f41..a8e1012 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=".10"
+TK_PATCH_LEVEL=".11"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------