From 27dea7f90bb62c07880d067818d066545050809d Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 16 Jan 2009 20:55:12 +0000 Subject: * generic/tk.h: Bump patchlevel to 8.6b1.1 to distinguish * library/tk.tcl: CVS snapshots from the 8.6b1 and 8.6b2 releases. * unix/configure.in: * win/configure.in: * unix/configure: autoconf-2.59 * win/configure: --- ChangeLog | 10 ++++++++++ generic/tk.h | 4 ++-- library/tk.tcl | 4 ++-- unix/configure | 2 +- unix/configure.in | 4 ++-- win/configure | 2 +- win/configure.in | 4 ++-- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1488c64..2814290 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-01-16 Don Porter + + * generic/tk.h: Bump patchlevel to 8.6b1.1 to distinguish + * library/tk.tcl: CVS snapshots from the 8.6b1 and 8.6b2 releases. + * unix/configure.in: + * win/configure.in: + + * unix/configure: autoconf-2.59 + * win/configure: + 2009-01-14 Jan Nijtmans * generic/tkImgPhoto.c: fix for aMSN compatibility [tcl-Bug 2507326] diff --git a/generic/tk.h b/generic/tk.h index 19a2caf..006f44c 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk.h,v 1.128 2009/01/06 21:58:15 nijtmans Exp $ + * RCS: @(#) $Id: tk.h,v 1.129 2009/01/16 20:55:12 dgp Exp $ */ #ifndef _TK @@ -56,7 +56,7 @@ extern "C" { #define TK_RELEASE_SERIAL 1 #define TK_VERSION "8.6" -#define TK_PATCH_LEVEL "8.6b1" +#define TK_PATCH_LEVEL "8.6b1.1" /* * A special definition used to allow this header file to be included from diff --git a/library/tk.tcl b/library/tk.tcl index 7f0cd91..6299d01 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -3,7 +3,7 @@ # Initialization script normally executed in the interpreter for each # Tk-based application. Arranges class bindings for widgets. # -# RCS: @(#) $Id: tk.tcl,v 1.82 2009/01/11 11:51:39 patthoyts Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.83 2009/01/16 20:55:12 dgp Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -15,7 +15,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.6b1 +package require -exact Tk 8.6b1.1 # Create a ::tk namespace namespace eval ::tk { diff --git a/unix/configure b/unix/configure index 1efab26..f4fca5c 100755 --- a/unix/configure +++ b/unix/configure @@ -1337,7 +1337,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu TK_VERSION=8.6 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=6 -TK_PATCH_LEVEL="b1" +TK_PATCH_LEVEL="b1.1" 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 8d3bfc3..5810e21 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.161 2008/12/19 14:32:25 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.162 2009/01/16 20:55:12 dgp Exp $ AC_INIT([tk],[8.6]) AC_PREREQ(2.59) @@ -27,7 +27,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [ TK_VERSION=8.6 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=6 -TK_PATCH_LEVEL="b1" +TK_PATCH_LEVEL="b1.1" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" diff --git a/win/configure b/win/configure index 6dcc788..ad09676 100755 --- a/win/configure +++ b/win/configure @@ -1309,7 +1309,7 @@ SHELL=/bin/sh TK_VERSION=8.6 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=6 -TK_PATCH_LEVEL="b1" +TK_PATCH_LEVEL="b1.1" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/configure.in b/win/configure.in index 8f31322..a8d5988 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.84 2008/12/19 14:32:25 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.85 2009/01/16 20:55:12 dgp Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.59) @@ -16,7 +16,7 @@ SHELL=/bin/sh TK_VERSION=8.6 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=6 -TK_PATCH_LEVEL="b1" +TK_PATCH_LEVEL="b1.1" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ -- cgit v0.12