summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--unix/Makefile.in10
2 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index db6e939..7d334ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-25 Jeff Hobbs <jeffh@ActiveState.com>
+
+ *** 8.5a6 TAGGED FOR RELEASE ***
+
+ * unix/Makefile.in (dist): add tests/ttk dir to src dist
+
+ * unix/tkUnixMenubu.c (TkpDisplayMenuButton): init width/height to 0
+
2007-04-25 Daniel Steffen <das@users.sourceforge.net>
* unix/Makefile.in (dist): add macosx/*.xcconfig files to src dist;
@@ -5,8 +13,6 @@
2007-04-24 Jeff Hobbs <jeffh@ActiveState.com>
- *** 8.5a6 TAGGED FOR RELEASE ***
-
* unix/Makefile.in (dist): add ttk bits to src dist
* tests/font.test (font-46.[12]): correct listification of result
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6f0ef78..a9c9421 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.125 2007/04/25 03:40:59 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.126 2007/04/25 17:09:13 hobbs Exp $
# Current Tk version; used in various names.
@@ -1616,11 +1616,11 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in
cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
$(TCLDIR)/doc/man.macros $(DISTDIR)/doc
mkdir $(DISTDIR)/tests
- cp -p $(TOP_DIR)/license.terms $(TEST_DIR)/*.test \
- $(TEST_DIR)/*.tcl $(TEST_DIR)/README \
- $(TEST_DIR)/*.gif $(TEST_DIR)/*.ppm \
- $(TEST_DIR)/*.xbm \
+ cp -p $(TOP_DIR)/license.terms $(TEST_DIR)/*.{test,tcl} \
+ $(TEST_DIR)/README $(TEST_DIR)/*.{gif,ppm,xbm} \
$(TEST_DIR)/option.file* $(DISTDIR)/tests
+ mkdir $(DISTDIR)/tests/ttk
+ cp -p $(TEST_DIR)/*.{test,tcl} $(DISTDIR)/tests/ttk
#
# The following target can only be used for non-patch releases. Use