summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2006-04-28 00:02:49 +0000
committerwtchang%redhat.com <devnull@localhost>2006-04-28 00:02:49 +0000
commited67952f7d2697c3abf8902fb1d55460ac92872a (patch)
tree16760c84bc53a8accd515fc7b32342298ef265a0
parentaa8ee62b1dc430c5cb94d97037dcb9db9acb2bdd (diff)
downloadnspr-hg-ed67952f7d2697c3abf8902fb1d55460ac92872a.tar.gz
Changed NSPR version to 4.6.2.NSPR_4_6_2_RTM
Modified Files: configure configure.in repackage.sh prinit.h vercheck.c Tag: NSPR_4_6_BRANCH
-rwxr-xr-xadmin/repackage.sh8
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
-rw-r--r--pr/include/prinit.h4
-rw-r--r--pr/tests/vercheck.c6
5 files changed, 11 insertions, 11 deletions
diff --git a/admin/repackage.sh b/admin/repackage.sh
index fcdce44f..a6d4ac95 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.6.2
+TOTOP=./v4.6.2
+NSPRDIR=nspr-4.6.2
+SOURCETAG=NSPR_4_6_2_RTM
#
# enumerate Unix object directories on /s/b/c
diff --git a/configure b/configure
index 20b73d82..e553d5c9 100755
--- a/configure
+++ b/configure
@@ -687,7 +687,7 @@ test "$host_alias" != "$target_alias" &&
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=6
-MOD_PATCH_VERSION=1
+MOD_PATCH_VERSION=2
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/configure.in b/configure.in
index 2d5a87d7..35f497ec 100644
--- a/configure.in
+++ b/configure.in
@@ -50,7 +50,7 @@ dnl = Defaults
dnl ========================================================
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=6
-MOD_PATCH_VERSION=1
+MOD_PATCH_VERSION=2
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/pr/include/prinit.h b/pr/include/prinit.h
index e42dd1fe..4b871f5f 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.2 Beta"
+#define PR_VERSION "4.6.2"
#define PR_VMAJOR 4
#define PR_VMINOR 6
#define PR_VPATCH 2
-#define PR_BETA PR_TRUE
+#define PR_BETA PR_FALSE
/*
** PRVersionCheck
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index 5174c0b3..2dfab53d 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.6.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, and 4.6.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", PR_VERSION
+ "4.5", "4.5.1", "4.6", "4.6.1", PR_VERSION
};
/*