From ddd44faba25eff59264d2dc2d531e1dd801b08ae Mon Sep 17 00:00:00 2001
From: "wtc%google.com" <wtc%google.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 2 May 2008 19:09:54 +0000
Subject: [PATCH] Set NSPR version to 4.7.2 Beta. Modified files: configure
 configure.in repackage.sh prinit.h vercheck.c

git-svn-id: svn://10.0.0.236/trunk@251112 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/nsprpub/admin/repackage.sh  |  8 ++++----
 mozilla/nsprpub/configure           |  2 +-
 mozilla/nsprpub/configure.in        |  2 +-
 mozilla/nsprpub/pr/include/prinit.h |  6 +++---
 mozilla/nsprpub/pr/tests/vercheck.c | 13 +++++++------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/mozilla/nsprpub/admin/repackage.sh b/mozilla/nsprpub/admin/repackage.sh
index 67942dab464..bc219ccee36 100755
--- a/mozilla/nsprpub/admin/repackage.sh
+++ b/mozilla/nsprpub/admin/repackage.sh
@@ -64,10 +64,10 @@
 # 
 # ------------------------------------------------------------------
 
-FROMTOP=/share/builds/components/nspr20/v4.7.1
-TOTOP=./v4.7.1
-NSPRDIR=nspr-4.7.1
-SOURCETAG=NSPR_4_7_1_RTM
+FROMTOP=/share/builds/components/nspr20/v4.7.2
+TOTOP=./v4.7.2
+NSPRDIR=nspr-4.7.2
+SOURCETAG=NSPR_4_7_2_RTM
 
 #
 # enumerate Unix object directories on /s/b/c
diff --git a/mozilla/nsprpub/configure b/mozilla/nsprpub/configure
index 4848916fb9a..e7fdaae9115 100755
--- a/mozilla/nsprpub/configure
+++ b/mozilla/nsprpub/configure
@@ -692,7 +692,7 @@ test "$host_alias" != "$target_alias" &&
 
 MOD_MAJOR_VERSION=4
 MOD_MINOR_VERSION=7
-MOD_PATCH_VERSION=1
+MOD_PATCH_VERSION=2
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=
 USE_PTHREADS=
diff --git a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in
index 55f887249ce..72dcb7eb641 100644
--- a/mozilla/nsprpub/configure.in
+++ b/mozilla/nsprpub/configure.in
@@ -50,7 +50,7 @@ dnl = Defaults
 dnl ========================================================
 MOD_MAJOR_VERSION=4
 MOD_MINOR_VERSION=7
-MOD_PATCH_VERSION=1
+MOD_PATCH_VERSION=2
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=
 USE_PTHREADS=
diff --git a/mozilla/nsprpub/pr/include/prinit.h b/mozilla/nsprpub/pr/include/prinit.h
index 5239e4fa5a9..2373eb4eeb0 100644
--- a/mozilla/nsprpub/pr/include/prinit.h
+++ b/mozilla/nsprpub/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.7.1"
+#define PR_VERSION  "4.7.2 Beta"
 #define PR_VMAJOR   4
 #define PR_VMINOR   7
-#define PR_VPATCH   1
-#define PR_BETA     PR_FALSE
+#define PR_VPATCH   2
+#define PR_BETA     PR_TRUE
 
 /*
 ** PRVersionCheck
diff --git a/mozilla/nsprpub/pr/tests/vercheck.c b/mozilla/nsprpub/pr/tests/vercheck.c
index c47eb899d6f..fa82cb12e52 100644
--- a/mozilla/nsprpub/pr/tests/vercheck.c
+++ b/mozilla/nsprpub/pr/tests/vercheck.c
@@ -52,16 +52,17 @@
 #include <stdlib.h>
 
 /*
- * 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.
+ * This release (4.7.2) 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, and
+ * 4.7.1 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", "4.6.1", "4.6.2", "4.6.3", "4.6.4", "4.6.5", "4.6.6", "4.6.7", "4.6.8",
-    "4.7", PR_VERSION
+    "4.6", "4.6.1", "4.6.2", "4.6.3", "4.6.4", "4.6.5",
+    "4.6.6", "4.6.7", "4.6.8",
+    "4.7", "4.7.1", PR_VERSION
 };
 
 /*
@@ -76,7 +77,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.7.3",
+    "4.7.9",
     "4.8", "4.8.1",
     "10.0", "11.1", "12.14.20"
 };