diff --git a/configure.in b/configure.in index c22b630169..aaaeebc258 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.8.2], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [2.8.3], [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=2 +wx_release_number=3 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number diff --git a/docs/msw/install.txt b/docs/msw/install.txt index 8f44b8f0d9..fd90d6af41 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -766,9 +766,9 @@ VENDOR= distribute wxWidgets DLLs with your application. Default value is 'custom'. This string is included as part of DLL name. wxWidgets DLLs contain compiler name, version information and vendor name in them. For example - wxmsw280_core_bcc_custom.dll is one of DLLs build using Borland C++ with + wxmsw283_core_bcc_custom.dll is one of DLLs build using Borland C++ with default settings. If you set VENDOR=mycorp, the name will change to - wxmsw280_core_bcc_mycorp.dll. + wxmsw283_core_bcc_mycorp.dll. CFG= Sets configuration name so that you can have multiple wxWidgets builds with diff --git a/docs/tech/tn0011.txt b/docs/tech/tn0011.txt index 60beb96cfa..8ef70ca365 100644 --- a/docs/tech/tn0011.txt +++ b/docs/tech/tn0011.txt @@ -10,11 +10,12 @@ {wx}/configure.in {wx}/*.spec {wx}/include/wx/version.h - {wx}/include/msvc/wx/setup.h + {wx}/include/msvc/wx/setup.h {major release only} {wx}/docs/latex/wx/manual.tex {wx}/docs/msw/install.txt {wx}/docs/changes.txt - {wx}/build/bakefiles/wxpresets/presets/wx_win32.bkl + {wx}/build/bakefiles/wxpresets/presets/wx_win32.bkl {major release only} + {wx}/build/bakefiles/version.bkl {C:R:A} {wx}/build/script/win_docs.bat {windows doc and setup file} {wx}/distrib/scripts/build-environ.cfg {cvs tar and zip files} @@ -33,6 +34,9 @@ Version: $Id$ $Log$ +Revision 1.10.2.2 2007/03/15 09:54:04 CE +update to 2.8.3 (configure and version.bkl to follow) + Revision 1.10.2.1 2007/02/12 10:54:52 CE add docs/msw/install.txt diff --git a/include/wx/version.h b/include/wx/version.h index acf7ee7d61..0c38297673 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 2 +#define wxRELEASE_NUMBER 3 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING _T("wxWidgets 2.8.2") +#define wxVERSION_STRING _T("wxWidgets 2.8.3") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/wxBase.spec b/wxBase.spec index d7962fa7f2..9b5b8f024c 100644 --- a/wxBase.spec +++ b/wxBase.spec @@ -1,7 +1,7 @@ %define pref /usr -%define ver 2.8.2 +%define ver 2.8.3 %define ver2 2.8 -%define rel 2 +%define rel 3 # Configurable settings (use --with(out) unicode on rpmbuild command line): %define unicode 0 diff --git a/wxGTK.spec b/wxGTK.spec index 7c70e1dbb4..b28f108ba9 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,7 +1,7 @@ %define _prefix /usr -%define ver 2.8.2 +%define ver 2.8.3 %define ver2 2.8 -%define rel 2 +%define rel 3 # Configurable settings (use --with(out) {unicode,gtk2} on rpmbuild cmd line): %define unicode 1 diff --git a/wxMGL.spec b/wxMGL.spec index 35ddfcd2f1..d6a35005df 100644 --- a/wxMGL.spec +++ b/wxMGL.spec @@ -1,7 +1,7 @@ %define pref /usr -%define ver 2.8.2 +%define ver 2.8.3 %define ver2 2.8 -%define rel 2 +%define rel 3 Summary: The SciTech MGL port of the wxWindows library Name: wxMGL diff --git a/wxMotif.spec b/wxMotif.spec index c025dd6cdd..2754e74a12 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -1,7 +1,7 @@ %define pref /usr -%define ver 2.8.2 +%define ver 2.8.3 %define ver2 2.8 -%define rel 2 +%define rel 3 %define portname motif %define name wx-%{portname} diff --git a/wxX11.spec b/wxX11.spec index a43500f6a8..3afbe892d7 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -1,7 +1,7 @@ %define pref /usr -%define ver 2.8.2 +%define ver 2.8.3 %define ver2 2.8 -%define rel 2 +%define rel 3 # Configurable settings (use --with(out) unicode on rpmbuild cmd line): %define unicode 0