From 4fd169bda51ceab82cbef94af2b7acee53b224f0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 7 Jan 2007 22:21:20 +0000 Subject: [PATCH] updated version to 2.8.1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/script/win_docs.bat | 2 +- configure | 50 ++++++++++++++++++++++++----------------------- configure.in | 6 +++--- docs/latex/wx/manual.tex | 2 +- include/wx/version.h | 4 ++-- wxBase.spec | 2 +- wxGTK.spec | 2 +- wxMGL.spec | 2 +- wxMotif.spec | 2 +- wxX11.spec | 2 +- 10 files changed, 38 insertions(+), 36 deletions(-) diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat index 49c1329..5e70f03 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 -rem SET WXW_VER=2.8.0 +rem SET WXW_VER=2.8.1 if (%WXW_VER%)==() SET WXW_VER=CVS echo docs building for %WXW_VER% diff --git a/configure b/configure index 310eece..e8e1b65 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id: configure.in. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.0. +# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.1. # # 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.0' -PACKAGE_STRING='wxWidgets 2.8.0' +PACKAGE_VERSION='2.8.1' +PACKAGE_STRING='wxWidgets 2.8.1' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' ac_unique_file="wx-config.in" @@ -870,7 +870,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.0 to adapt to many kinds of systems. +\`configure' configures wxWidgets 2.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -936,7 +936,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.8.0:";; + short | recursive ) echo "Configuration of wxWidgets 2.8.1:";; esac cat <<\_ACEOF @@ -1339,7 +1339,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.8.0 +wxWidgets configure 2.8.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1353,7 +1353,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.0, which was +It was created by wxWidgets $as_me 2.8.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1804,8 +1804,8 @@ test -n "$target_alias" && wx_major_version_number=2 wx_minor_version_number=8 -wx_release_number=0 -wx_subrelease_number=2 +wx_release_number=1 +wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_VERSION=$WX_RELEASE.$wx_release_number @@ -12652,7 +12652,7 @@ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS -g" +CFLAGS="-g" echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then @@ -13124,7 +13124,7 @@ fi unset ac_cv_prog_cc_g ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS -g" +CFLAGS="-g" echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then @@ -14289,9 +14289,9 @@ if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then - CXXFLAGS="$CXXFLAGS -g -O2" + CXXFLAGS="-g -O2" else - CXXFLAGS="$CXXFLAGS -g" + CXXFLAGS="-g" fi else if test "$GXX" = yes; then @@ -14554,7 +14554,7 @@ fi unset ac_cv_prog_cc_g ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS -g" +CFLAGS="-g" echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then @@ -29810,7 +29810,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -29837,7 +29837,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -29851,18 +29851,18 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -29900,7 +29900,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r $ac_dir/libX11.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi @@ -46747,8 +46747,10 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include + + #include + #include + #include _ACEOF @@ -51440,7 +51442,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by wxWidgets $as_me 2.8.0, which was +This file was extended by wxWidgets $as_me 2.8.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -51503,7 +51505,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.8.0 +wxWidgets config.status 2.8.1 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 adf0bad..841623d 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.8.0], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [2.8.1], [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,8 +34,8 @@ dnl wx_release_number += 1 wx_major_version_number=2 wx_minor_version_number=8 -wx_release_number=0 -wx_subrelease_number=2 +wx_release_number=1 +wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_VERSION=$WX_RELEASE.$wx_release_number diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex index 6ff922a..88241a4 100644 --- a/docs/latex/wx/manual.tex +++ b/docs/latex/wx/manual.tex @@ -26,7 +26,7 @@ %\special{!/@scaleunit 1 def} \parskip=10pt \parindent=0pt -\title{wxWidgets 2.8.0: A portable C++ and Python GUI toolkit} +\title{wxWidgets 2.8.1: A portable C++ and Python GUI toolkit} \winhelponly{\author{by Julian Smart et al %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$} }} diff --git a/include/wx/version.h b/include/wx/version.h index c264ecf..147ce25 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -28,8 +28,8 @@ /* 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 0 -#define wxSUBRELEASE_NUMBER 2 +#define wxRELEASE_NUMBER 1 +#define wxSUBRELEASE_NUMBER 0 #define wxVERSION_STRING _T("wxWidgets 2.8.0") /* nothing to update below this line when updating the version */ diff --git a/wxBase.spec b/wxBase.spec index 00b11e2..731b0c6 100644 --- a/wxBase.spec +++ b/wxBase.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.0 +%define ver 2.8.1 %define ver2 2.8 %define rel 1 diff --git a/wxGTK.spec b/wxGTK.spec index c05dcfe..2aa7b81 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,5 +1,5 @@ %define _prefix /usr -%define ver 2.8.0 +%define ver 2.8.1 %define ver2 2.8 %define rel 1 diff --git a/wxMGL.spec b/wxMGL.spec index 5ee72a6..6d2b3d5 100644 --- a/wxMGL.spec +++ b/wxMGL.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.0 +%define ver 2.8.1 %define ver2 2.8 %define rel 1 diff --git a/wxMotif.spec b/wxMotif.spec index 58bba47..6eeb143 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.0 +%define ver 2.8.1 %define ver2 2.8 %define rel 1 diff --git a/wxX11.spec b/wxX11.spec index 3a4b985..218ef93 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.8.0 +%define ver 2.8.1 %define ver2 2.8 %define rel 1 -- 2.7.4