diff --git a/configure b/configure index 8b47a5f429..f96dd0a0f3 100755 --- a/configure +++ b/configure @@ -1086,7 +1086,7 @@ test "$host_alias" != "$target_alias" && WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=4 -WX_RELEASE_NUMBER=3 +WX_RELEASE_NUMBER=2 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER diff --git a/configure.in b/configure.in index cc79c8c0b8..48064eb81c 100644 --- a/configure.in +++ b/configure.in @@ -48,7 +48,7 @@ dnl libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE) WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=4 -WX_RELEASE_NUMBER=3 +WX_RELEASE_NUMBER=2 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER diff --git a/debian/changelog b/debian/changelog index cdd64508dc..23adc8e773 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,12 @@ wxwindows2.4 (2.4.3.1) unstable; urgency=high stupid that relies on them, even tangentially. Too late to test that now, so be on notice, its a sign-o-the-times for etch. * New artwork. See below. + * Forge the internal version number to be wx2.4.2 / wxPy2.4.2.4 for + this release, to be 100% compatible with the binaries already in + testing. Some packages (boa-constructor being the first reported) + check this at runtime and cannot tolerate a library version upgrade + without modification to their own code. This is an issue to resolve + after the freeze. -- Ron Lee Wed, 25 May 2005 11:36:49 +0930 diff --git a/include/wx/version.h b/include/wx/version.h index 1eaea7ed53..cebe9ecde7 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -15,13 +15,13 @@ // Bump-up with each new version #define wxMAJOR_VERSION 2 #define wxMINOR_VERSION 4 -#define wxRELEASE_NUMBER 3 -#define wxVERSION_STRING _T("wxWindows 2.4.3") +#define wxRELEASE_NUMBER 2 +#define wxVERSION_STRING _T("wxWindows 2.4.2") // These are used by src/msw/version.rc and should always be ASCII, not Unicode // and must be updated manually as well each time the version above changes -#define wxVERSION_NUM_DOT_STRING "2.4.3" -#define wxVERSION_NUM_STRING "243" +#define wxVERSION_NUM_DOT_STRING "2.4.2" +#define wxVERSION_NUM_STRING "242" // nothing should be updated below this line when updating the version diff --git a/wxPython/setup.py b/wxPython/setup.py index b7c752b53c..ed0ab97960 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -15,8 +15,8 @@ from distutils.command.install_data import install_data VER_MAJOR = 2 # The first three must match wxWindows VER_MINOR = 4 -VER_RELEASE = 3 -VER_SUBREL = 1 # wxPython release num for x.y.z release of wxWindows +VER_RELEASE = 2 +VER_SUBREL = 4 # wxPython release num for x.y.z release of wxWindows VER_FLAGS = "" # release flags, such as prerelease num, unicode, etc. DESCRIPTION = "Cross platform GUI toolkit for Python" diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py index 2d08d79aea..96584a3b7b 100644 --- a/wxPython/src/__version__.py +++ b/wxPython/src/__version__.py @@ -1,10 +1,10 @@ # This file was generated by setup.py... -wxVERSION_STRING = '2.4.3.1' +wxVERSION_STRING = '2.4.2.4' wxMAJOR_VERSION = 2 wxMINOR_VERSION = 4 -wxRELEASE_VERSION = 3 -wxSUBREL_VERSION = 1 +wxRELEASE_VERSION = 2 +wxSUBREL_VERSION = 4 wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION, wxSUBREL_VERSION, '')