summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-06 12:33:14 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-06 12:33:14 (GMT)
commitfa39cca32f7a3c8e4ae8c5964313497890a387a4 (patch)
tree72c23e9c94c5a99b176eecc8731af626df2e805a
parent0a562b0983eb298ebbcb211ed886a9fef5b4c1ce (diff)
parent779aba1c853be107103b3d87ac6db4bf9bd9c6e6 (diff)
downloadtcl-fa39cca32f7a3c8e4ae8c5964313497890a387a4.zip
tcl-fa39cca32f7a3c8e4ae8c5964313497890a387a4.tar.gz
tcl-fa39cca32f7a3c8e4ae8c5964313497890a387a4.tar.bz2
Merge 8.6
-rw-r--r--library/manifest.txt2
-rw-r--r--unix/Makefile.in2
-rw-r--r--win/Makefile.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/library/manifest.txt b/library/manifest.txt
index 11a755a..307302f 100644
--- a/library/manifest.txt
+++ b/library/manifest.txt
@@ -10,7 +10,7 @@ apply {{dir} {
1 opt 0.4.7 {opt optparse.tcl}
0 platform 1.0.14 {platform platform.tcl}
0 platform::shell 1.1.4 {platform shell.tcl}
- 1 tcltest 2.5.0 {tcltest tcltest.tcl}
+ 1 tcltest 2.5.1 {tcltest tcltest.tcl}
} {
if {$isafe && !$safe} continue
package ifneeded $package $version [list source [file join $dir {*}$file]]
diff --git a/unix/Makefile.in b/unix/Makefile.in
index c62a31e..46b5ac7 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -949,7 +949,7 @@ install-libraries: libraries
"$(MODULE_INSTALL_DIR)"/tcl8/8.7/msgcat-1.7.0.tm
@echo "Installing package tcltest 2.5.0 as a Tcl Module"
@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
- "$(MODULE_INSTALL_DIR)"/tcl8/8.5/tcltest-2.5.0.tm
+ "$(MODULE_INSTALL_DIR)"/tcl8/8.5/tcltest-2.5.1.tm
@echo "Installing package platform 1.0.14 as a Tcl Module"
@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
"$(MODULE_INSTALL_DIR)"/tcl8/8.4/platform-1.0.14.tm
diff --git a/win/Makefile.in b/win/Makefile.in
index 7bc4c1d..9aa5458 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -869,7 +869,7 @@ install-libraries: libraries install-tzdata install-msgs
@echo "Installing package msgcat 1.7.0 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.7/msgcat-1.7.0.tm;
@echo "Installing package tcltest 2.4.0 as a Tcl Module";
- @$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.4.0.tm;
+ @$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.5.1.tm;
@echo "Installing package platform 1.0.14 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.14.tm;
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";