diff options
| -rwxr-xr-x | admin/repackage.sh | 8 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | pr/include/prinit.h | 6 | ||||
| -rw-r--r-- | pr/tests/vercheck.c | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/admin/repackage.sh b/admin/repackage.sh index d25b15a5..fcdce44f 100755 --- a/admin/repackage.sh +++ b/admin/repackage.sh @@ -64,10 +64,10 @@ # # ------------------------------------------------------------------ -FROMTOP=/share/builds/components/nspr20/v4.6 -TOTOP=./v4.6 -NSPRDIR=nspr-4.6 -SOURCETAG=NSPR_4_6_RTM +FROMTOP=/share/builds/components/nspr20/v4.6.1 +TOTOP=./v4.6.1 +NSPRDIR=nspr-4.6.1 +SOURCETAG=NSPR_4_6_1_RTM # # enumerate Unix object directories on /s/b/c @@ -682,7 +682,7 @@ test "$host_alias" != "$target_alias" && MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=6 -MOD_PATCH_VERSION=0 +MOD_PATCH_VERSION=1 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff --git a/configure.in b/configure.in index b085ff5e..fafecb92 100644 --- a/configure.in +++ b/configure.in @@ -45,7 +45,7 @@ dnl = Defaults dnl ======================================================== MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=6 -MOD_PATCH_VERSION=0 +MOD_PATCH_VERSION=1 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff --git a/pr/include/prinit.h b/pr/include/prinit.h index 70b4567d..e7ca7bce 100644 --- a/pr/include/prinit.h +++ b/pr/include/prinit.h @@ -63,11 +63,11 @@ PR_BEGIN_EXTERN_C ** The format of the version string is ** "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define PR_VERSION "4.6" +#define PR_VERSION "4.6.1 Beta" #define PR_VMAJOR 4 #define PR_VMINOR 6 -#define PR_VPATCH 0 -#define PR_BETA PR_FALSE +#define PR_VPATCH 1 +#define PR_BETA PR_TRUE /* ** PRVersionCheck diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c index d1fdb96e..5174c0b3 100644 --- a/pr/tests/vercheck.c +++ b/pr/tests/vercheck.c @@ -52,14 +52,14 @@ #include <stdlib.h> /* - * This release (4.6) is backward compatible with the - * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, and 4.5.x releases. It, of course, - * is compatible with itself. + * This release (4.6.1) is backward compatible with the + * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, and 4.6 releases. + * It, of course, is compatible with itself. */ static char *compatible_version[] = { "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3", "4.2", "4.2.1", "4.2.2", "4.3", "4.4", "4.4.1", - "4.5", "4.5.1", PR_VERSION + "4.5", "4.5.1", "4.6", PR_VERSION }; /* |