From 7a0bde63d21f54ce83bde639876802b592545bc9 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 26 Oct 2011 14:22:20 +0000 Subject: Release candidate branch for Tk 8.5.11 --- README | 2 +- library/tk.tcl | 2 +- unix/configure | 2 +- unix/configure.in | 2 +- unix/tk.spec | 2 +- win/configure | 2 +- win/configure.in | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) 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/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 #------------------------------------------------------------------------ -- cgit v0.12 From 97e8e62647a53e2afa11919430a654b6716474e5 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 26 Oct 2011 14:26:41 +0000 Subject: typo --- changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes b/changes index a6779fc..ba6314d 100644 --- a/changes +++ b/changes @@ -6792,4 +6792,4 @@ 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 --- +--- Released 8.5.11, November 1, 2011 --- See ChangeLog for details --- -- cgit v0.12 From 1b7908df0ceb3fbe77a732b14ae7270e9f14d2d5 Mon Sep 17 00:00:00 2001 From: dgp Date: Mon, 31 Oct 2011 19:35:04 +0000 Subject: overlooked pathclevel bump in tk.h --- generic/tk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v0.12 From 5fc39fbc28f871e47642e1e3b0a4cb049ccaa611 Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 1 Nov 2011 14:41:26 +0000 Subject: release tag --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 59769c3..18e335c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2011-10-26 Don Porter + *** 8.5.11 TAGGED FOR RELEASE *** + * changes: Updates for 8.5.11. 2011-10-01 Kevin B. Kenny -- cgit v0.12 From 9bc6d3a39db60af7ee2496433bfa93ff9eb3ef3a Mon Sep 17 00:00:00 2001 From: max Date: Tue, 8 Nov 2011 17:44:42 +0000 Subject: * Add square to DEMOPROGS in unix/Makefile.in. It contains a shebang and hence should get installed with executable bits. * manpages: Fix the escaping of leading dots in lines that start with a widget name, so that nroff doesn't mistake it as a non-existing macro and skips the entire line. --- ChangeLog | 10 ++++++++++ doc/label.n | 2 +- doc/pack.n | 2 +- doc/text.n | 8 ++++---- doc/ttk_notebook.n | 6 +++--- unix/Makefile.in | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4fc0f18..4a09749 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-11-08 Reinhard Max + + * unix/Makefile.in: Add square to DEMOPROGS. It contains a shebang + and hence should get installed with executable bits. + + * doc/label.n: Fix the escaping of leading dots in lines that + * doc/text.n: start with a widget name, so that nroff + * doc/ttk_notebook.n: doesn't mistake it as a non-existing macro + * doc/pack.n: and skips the entire line. + 2011-11-04 Don Porter *** 8.5.11 TAGGED FOR RELEASE *** diff --git a/doc/label.n b/doc/label.n index 5e1139a..ef121cb 100644 --- a/doc/label.n +++ b/doc/label.n @@ -112,7 +112,7 @@ labels are not intended to be interactive. \fBlabel\fR .l \-text "Left\enHand\enSide" \fBlabel\fR .r \-text "Right\enHand\enSide" text .mid -\.mid insert end "This layout is like Java's BorderLayout" +\&.mid insert end "This layout is like Java's BorderLayout" # Lay them out pack .t \-side top \-fill x pack .b \-side bottom \-fill x diff --git a/doc/pack.n b/doc/pack.n index 0809337..73e4872 100644 --- a/doc/pack.n +++ b/doc/pack.n @@ -266,7 +266,7 @@ label .b \-text "This widget is at the bottom" \-bg green label .l \-text "Left\enHand\enSide" label .r \-text "Right\enHand\enSide" text .mid -\.mid insert end "This layout is like Java's BorderLayout" +\&.mid insert end "This layout is like Java's BorderLayout" # Lay them out \fBpack\fR .t \-side top \-fill x \fBpack\fR .b \-side bottom \-fill x diff --git a/doc/text.n b/doc/text.n index 69f7ac2..860bb89 100644 --- a/doc/text.n +++ b/doc/text.n @@ -2292,8 +2292,8 @@ match, the text widget will return the wrong result. In practice this is a rare problem, but it can occur, for example: .CS pack [text .t] -\.t insert 1.0 "aaaa\enbbbb\encccc\enbbbb\enaaaa\en" -\.t search \-regexp \-\- {(a+|b+\enc+\enb+)+\ena+} 1.0 +\&.t insert 1.0 "aaaa\enbbbb\encccc\enbbbb\enaaaa\en" +\&.t search \-regexp \-\- {(a+|b+\enc+\enb+)+\ena+} 1.0 .CE will not find a match when one exists of 19 characters starting from the first @@ -2310,8 +2310,8 @@ possible match which might cover large portions of the widget. For example: .CS pack [text .t] -\.t insert 1.0 "aaaa\enbbbb\enbbbb\enbbbb\enbbbb\\n" -\.t search \-regexp \-backward \-\- {b+\en|a+\en(b+\en)+} end +\&.t insert 1.0 "aaaa\enbbbb\enbbbb\enbbbb\enbbbb\\n" +\&.t search \-regexp \-backward \-\- {b+\en|a+\en(b+\en)+} end .CE matches at .QW 5.0 diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n index d6c33d3..c0de39e 100644 --- a/doc/ttk_notebook.n +++ b/doc/ttk_notebook.n @@ -199,9 +199,9 @@ virtual event after a new tab is selected. .SH "EXAMPLE" .CS pack [\fBttk::notebook\fR .nb] -\.nb add [frame .nb.f1] \-text "First tab" -\.nb add [frame .nb.f2] \-text "Second tab" -\.nb select .nb.f2 +\&.nb add [frame .nb.f1] \-text "First tab" +\&.nb add [frame .nb.f2] \-text "Second tab" +\&.nb select .nb.f2 ttk::notebook::enableTraversal .nb .CE .SH "SEE ALSO" diff --git a/unix/Makefile.in b/unix/Makefile.in index fa23848..170f157 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -552,7 +552,7 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) -DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget +DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget SHELL_ENV = \ @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ -- cgit v0.12