From 2d3b74a0422cd28510abee615e6d3809ad68b647 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Thu, 28 Jan 2010 09:27:47 +0000 Subject: [PATCH] version to 2.8.11 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@63293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/version.bkl | 2 +- build/script/win_docs.bat | 2 +- configure | 20 ++++++++++---------- configure.in | 4 ++-- distrib/scripts/build-environ.cfg | 2 +- docs/latex/wx/manual.tex | 4 ++-- docs/readme.txt | 2 +- include/wx/version.h | 4 ++-- wxBase.spec | 2 +- wxGTK.spec | 2 +- wxMGL.spec | 2 +- wxMotif.spec | 2 +- wxX11.spec | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl index bab5845875..c1d4ac38a2 100644 --- a/build/bakefiles/version.bkl +++ b/build/bakefiles/version.bkl @@ -24,7 +24,7 @@ changes, change C:R:A to C:R+1:A --> 6 - 0 + 1 6 diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat index 6ec04e7b04..fee8efc657 100644 --- a/build/script/win_docs.bat +++ b/build/script/win_docs.bat @@ -1,5 +1,5 @@ rem Uncomment the next line to set the version; used also in wxWidgets.iss -SET WXW_VER=2.8.10 +SET WXW_VER=2.8.11-rc1 if (%WXW_VER%)==() SET WXW_VER=CVS diff --git a/configure b/configure index b13c3ccd7a..5f3045313e 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.10. +# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.11. # # Report bugs to . # @@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='2.8.10' -PACKAGE_STRING='wxWidgets 2.8.10' +PACKAGE_VERSION='2.8.11' +PACKAGE_STRING='wxWidgets 2.8.11' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' ac_unique_file="wx-config.in" @@ -866,7 +866,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 2.8.10 to adapt to many kinds of systems. +\`configure' configures wxWidgets 2.8.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -932,7 +932,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.8.10:";; + short | recursive ) echo "Configuration of wxWidgets 2.8.11:";; esac cat <<\_ACEOF @@ -1338,7 +1338,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.8.10 +wxWidgets configure 2.8.11 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1352,7 +1352,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxWidgets $as_me 2.8.10, which was +It was created by wxWidgets $as_me 2.8.11, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1803,7 +1803,7 @@ test -n "$target_alias" && wx_major_version_number=2 wx_minor_version_number=8 -wx_release_number=10 +wx_release_number=11 wx_subrelease_number=1 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -51375,7 +51375,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by wxWidgets $as_me 2.8.10, which was +This file was extended by wxWidgets $as_me 2.8.11, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -51438,7 +51438,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.8.10 +wxWidgets config.status 2.8.11 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 3ffa8089fd..a9bebd90e0 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.8.10], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [2.8.11], [wx-dev@lists.wxwidgets.org]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -34,7 +34,7 @@ dnl wx_release_number += 1 wx_major_version_number=2 wx_minor_version_number=8 -wx_release_number=10 +wx_release_number=11 wx_subrelease_number=1 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg index bc3b4efcc1..dabd040c2b 100644 --- a/distrib/scripts/build-environ.cfg +++ b/distrib/scripts/build-environ.cfg @@ -18,7 +18,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/ CURDATE=`date -I` # build info -BUILD_VERSION=2.8.10 +BUILD_VERSION=2.8.11-rc1 BUILD_TAG=HEAD diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex index 1d78c712ae..153f34bedc 100644 --- a/docs/latex/wx/manual.tex +++ b/docs/latex/wx/manual.tex @@ -26,13 +26,13 @@ %\special{!/@scaleunit 1 def} \parskip=10pt \parindent=0pt -\title{wxWidgets 2.8.10: A portable C++ and Python GUI toolkit} +\title{wxWidgets 2.8.11: A portable C++ and Python GUI toolkit} \winhelponly{\author{by Julian Smart et al %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$} }} \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn, et al} -\date{February, 2009} +\date{February, 2010} } \makeindex \begin{document} diff --git a/docs/readme.txt b/docs/readme.txt index 45d4266692..f68f4ae401 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ -wxWidgets 2.8.10 +wxWidgets 2.8.11 --------------------------------------------------------- Welcome to wxWidgets, a sophisticated cross-platform C++ diff --git a/include/wx/version.h b/include/wx/version.h index cd5dda07e2..8652f5c331 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -28,9 +28,9 @@ /* NB: this file is parsed by automatic tools so don't change its format! */ #define wxMAJOR_VERSION 2 #define wxMINOR_VERSION 8 -#define wxRELEASE_NUMBER 10 +#define wxRELEASE_NUMBER 11 #define wxSUBRELEASE_NUMBER 1 -#define wxVERSION_STRING wxT("wxWidgets 2.8.10") +#define wxVERSION_STRING wxT("wxWidgets 2.8.11") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/wxBase.spec b/wxBase.spec index 8c387252ff..6b547fbb5c 100644 --- a/wxBase.spec +++ b/wxBase.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.10 +%define ver 2.8.11 %define ver2 2.8 %define rel 0 diff --git a/wxGTK.spec b/wxGTK.spec index 6cf38f3a58..1a657e26a0 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,5 +1,5 @@ %define _prefix /usr -%define ver 2.8.10 +%define ver 2.8.11 %define ver2 2.8 %define rel 0 diff --git a/wxMGL.spec b/wxMGL.spec index f87921b195..b7055a12bc 100644 --- a/wxMGL.spec +++ b/wxMGL.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.10 +%define ver 2.8.11 %define ver2 2.8 %define rel 0 diff --git a/wxMotif.spec b/wxMotif.spec index 42bc538e2c..c028238282 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.10 +%define ver 2.8.11 %define ver2 2.8 %define rel 0 diff --git a/wxX11.spec b/wxX11.spec index 6abcdded8d..7ea9623a81 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.10 +%define ver 2.8.11 %define ver2 2.8 %define rel 0