diff --git a/mozilla/nsprpub/configure b/mozilla/nsprpub/configure index 5348f5c0bb8..0b29e9d8458 100755 --- a/mozilla/nsprpub/configure +++ b/mozilla/nsprpub/configure @@ -736,7 +736,7 @@ test "$host_alias" != "$target_alias" && MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=5 +MOD_PATCH_VERSION=6 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff --git a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in index 079ed871a9b..64072541d01 100644 --- a/mozilla/nsprpub/configure.in +++ b/mozilla/nsprpub/configure.in @@ -15,7 +15,7 @@ dnl = Defaults dnl ======================================================== MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=5 +MOD_PATCH_VERSION=6 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff --git a/mozilla/nsprpub/pr/include/prinit.h b/mozilla/nsprpub/pr/include/prinit.h index bb1ce011486..9e5da3502fd 100644 --- a/mozilla/nsprpub/pr/include/prinit.h +++ b/mozilla/nsprpub/pr/include/prinit.h @@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C ** The format of the version string is ** ".[.] []" */ -#define PR_VERSION "4.9.5" +#define PR_VERSION "4.9.6 Beta" #define PR_VMAJOR 4 #define PR_VMINOR 9 -#define PR_VPATCH 5 -#define PR_BETA PR_FALSE +#define PR_VPATCH 6 +#define PR_BETA PR_TRUE /* ** PRVersionCheck diff --git a/mozilla/nsprpub/pr/tests/vercheck.c b/mozilla/nsprpub/pr/tests/vercheck.c index 556278fe405..3ba852e0aed 100644 --- a/mozilla/nsprpub/pr/tests/vercheck.c +++ b/mozilla/nsprpub/pr/tests/vercheck.c @@ -20,9 +20,9 @@ #include /* - * This release (4.9.5) is backward compatible with the + * This release (4.9.6) is backward compatible with the * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x, - * 4.8.x, 4.9, 4.9.1, 4.9.2, 4.9.3, and 4.9.4 releases. + * 4.8.x, 4.9, 4.9.1, 4.9.2, 4.9.3, 4.9.4, and 4.9.5 releases. * It, of course, is compatible with itself. */ static char *compatible_version[] = { @@ -35,7 +35,8 @@ static char *compatible_version[] = { "4.7.6", "4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5", "4.8.6", "4.8.7", "4.8.8", "4.8.9", - "4.9", "4.9.1", "4.9.2", "4.9.3", "4.9.4", PR_VERSION + "4.9", "4.9.1", "4.9.2", "4.9.3", "4.9.4", "4.9.5", + PR_VERSION }; /* @@ -50,7 +51,7 @@ static char *incompatible_version[] = { "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.9.6", + "4.9.7", "4.10", "4.10.1", "10.0", "11.1", "12.14.20" };