diff options
author | dgp <dgp@users.sourceforge.net> | 2012-12-21 06:10:51 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2012-12-21 06:10:51 (GMT) |
commit | 41f5d19540b0b3f053da352e1569c9a4ed019dd5 (patch) | |
tree | de890c8860a842440f19167c486a6c41a10f7daa | |
parent | c75a225d6fa0e8681ac24e2657b857cf56f4fbbd (diff) | |
parent | 7570fbe3b848f0d05b9b16849ec6d24ca5ef899f (diff) | |
download | tk-41f5d19540b0b3f053da352e1569c9a4ed019dd5.zip tk-41f5d19540b0b3f053da352e1569c9a4ed019dd5.tar.gz tk-41f5d19540b0b3f053da352e1569c9a4ed019dd5.tar.bz2 |
merge release
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | generic/tk.h | 6 | ||||
-rw-r--r-- | library/tk.tcl | 2 | ||||
-rwxr-xr-x | unix/configure | 2 | ||||
-rw-r--r-- | unix/configure.in | 2 | ||||
-rw-r--r-- | unix/tk.spec | 2 | ||||
-rwxr-xr-x | win/configure | 2 | ||||
-rw-r--r-- | win/configure.in | 2 |
9 files changed, 24 insertions, 10 deletions
@@ -1,3 +1,17 @@ +2012-12-11 Don Porter <dgp@users.sourceforge.net> + + *** 8.6.0 TAGGED FOR RELEASE *** + + * README: Bump version number to 8.6.0 + * generic/tk.h: + * library/tk.tcl: + * unix/configure.in: + * unix/tk.spec: + * win/configure.in: + + * unix/configure: autoconf-2.59 + * win/configure: + 2012-12-04 Francois Vogel <fvogelnew1@free.fr> * generic/tkTextIndex.c: [Bug 3588824]: bug in image index handling @@ -1,5 +1,5 @@ README: Tk - This is the Tk 8.6b3 source distribution. + This is the Tk 8.6.0 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/generic/tk.h b/generic/tk.h index add2822..1594dc9 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -49,11 +49,11 @@ extern "C" { #define TK_MAJOR_VERSION 8 #define TK_MINOR_VERSION 6 -#define TK_RELEASE_LEVEL TCL_BETA_RELEASE -#define TK_RELEASE_SERIAL 3 +#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE +#define TK_RELEASE_SERIAL 0 #define TK_VERSION "8.6" -#define TK_PATCH_LEVEL "8.6b3" +#define TK_PATCH_LEVEL "8.6.0" /* * A special definition used to allow this header file to be included from diff --git a/library/tk.tcl b/library/tk.tcl index 1b4563e..282a9c7 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.6b3 +package require -exact Tk 8.6.0 # Create a ::tk namespace namespace eval ::tk { diff --git a/unix/configure b/unix/configure index 7f145ec..c0df51b 100755 --- a/unix/configure +++ b/unix/configure @@ -1339,7 +1339,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu TK_VERSION=8.6 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=6 -TK_PATCH_LEVEL="b3" +TK_PATCH_LEVEL=".0" 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 a7f9fc6..abc8a1d 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="b3" +TK_PATCH_LEVEL=".0" 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 6b10333..823b44b 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.6b3 +Version: 8.6.0 Release: 2 License: BSD Group: Development/Languages diff --git a/win/configure b/win/configure index 01ddccf..a1f5b11 100755 --- a/win/configure +++ b/win/configure @@ -1311,7 +1311,7 @@ SHELL=/bin/sh TK_VERSION=8.6 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=6 -TK_PATCH_LEVEL="b3" +TK_PATCH_LEVEL=".0" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/configure.in b/win/configure.in index e3be0a9..d411aff 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="b3" +TK_PATCH_LEVEL=".0" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ |