Set NSPR version to 4.7 (Beta).

 Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH

5 files changed, 16 insertions, 16 deletions

diff --git a/admin/repackage.sh b/admin/repackage.sh
index fcdce44f..c41fde42 100755
--- a/admin/repackage.sh
+++ b/admin/repackage.sh
@@ -64,10 +64,10 @@
 # 
 # ------------------------------------------------------------------
 
-FROMTOP=/share/builds/components/nspr20/v4.6.1
-TOTOP=./v4.6.1
-NSPRDIR=nspr-4.6.1
-SOURCETAG=NSPR_4_6_1_RTM
+FROMTOP=/share/builds/components/nspr20/v4.7
+TOTOP=./v4.7
+NSPRDIR=nspr-4.7
+SOURCETAG=NSPR_4_7_RTM
 
 #
 # enumerate Unix object directories on /s/b/c
diff --git a/configure b/configure
index 3e2a2e9d..dee2a0a3 100755
--- a/configure
+++ b/configure
@@ -684,8 +684,8 @@ test "$host_alias" != "$target_alias" &&
 
 
 MOD_MAJOR_VERSION=4
-MOD_MINOR_VERSION=6
-MOD_PATCH_VERSION=1
+MOD_MINOR_VERSION=7
+MOD_PATCH_VERSION=0
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=
 USE_PTHREADS=
diff --git a/configure.in b/configure.in
index 6a1a3682..9e9a2bcf 100644
--- a/configure.in
+++ b/configure.in
@@ -44,8 +44,8 @@ dnl ========================================================
 dnl = Defaults
 dnl ========================================================
 MOD_MAJOR_VERSION=4
-MOD_MINOR_VERSION=6
-MOD_PATCH_VERSION=1
+MOD_MINOR_VERSION=7
+MOD_PATCH_VERSION=0
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=
 USE_PTHREADS=
diff --git a/pr/include/prinit.h b/pr/include/prinit.h
index e7ca7bce..1ea7c05b 100644
--- a/pr/include/prinit.h
+++ b/pr/include/prinit.h
@@ -63,10 +63,10 @@ PR_BEGIN_EXTERN_C
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.6.1 Beta"
+#define PR_VERSION  "4.7 Beta"
 #define PR_VMAJOR   4
-#define PR_VMINOR   6
-#define PR_VPATCH   1
+#define PR_VMINOR   7
+#define PR_VPATCH   0
 #define PR_BETA     PR_TRUE
 
 /*
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index 5174c0b3..2a335bb1 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -52,14 +52,14 @@
 #include <stdlib.h>
 
 /*
- * 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.
+ * This release (4.7) 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.x 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", "4.6", PR_VERSION
+    "4.5", "4.5.1", "4.6", "4.6.1", PR_VERSION
 };
 
 /*
@@ -74,8 +74,8 @@ 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.6.3",
-    "4.7", "4.7.1",
+    "4.7.3",
+    "4.8", "4.8.1",
     "10.0", "11.1", "12.14.20"
 };