summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2006-12-01 23:31:51 +0000
committerwtchang%redhat.com <devnull@localhost>2006-12-01 23:31:51 +0000
commit6bb1a0851ee39c4f1551497b04bad0a08734d3f7 (patch)
tree53a6fa500deb3f51c93dbe94931ca931e05e9df7
parentba08b5901f3847c2a13b12c621f675ffb1abe2ed (diff)
downloadnspr-hg-6bb1a0851ee39c4f1551497b04bad0a08734d3f7.tar.gz
Set NSPR version to 4.6.5 (Beta).
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.h6
-rw-r--r--pr/tests/vercheck.c9
5 files changed, 14 insertions, 13 deletions
diff --git a/admin/repackage.sh b/admin/repackage.sh
index b267e6c1..4fb2708d 100755
--- a/admin/repackage.sh
+++ b/admin/repackage.sh
@@ -64,10 +64,10 @@
#
# ------------------------------------------------------------------
-FROMTOP=/share/builds/components/nspr20/v4.6.4
-TOTOP=./v4.6.4
-NSPRDIR=nspr-4.6.4
-SOURCETAG=NSPR_4_6_4_RTM
+FROMTOP=/share/builds/components/nspr20/v4.6.5
+TOTOP=./v4.6.5
+NSPRDIR=nspr-4.6.5
+SOURCETAG=NSPR_4_6_5_RTM
#
# enumerate Unix object directories on /s/b/c
diff --git a/configure b/configure
index 68660c33..2b6030af 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=4
+MOD_PATCH_VERSION=5
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/configure.in b/configure.in
index f6d99214..ef0e4006 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=4
+MOD_PATCH_VERSION=5
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/pr/include/prinit.h b/pr/include/prinit.h
index d040169e..b0ee66aa 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.4"
+#define PR_VERSION "4.6.5 Beta"
#define PR_VMAJOR 4
#define PR_VMINOR 6
-#define PR_VPATCH 4
-#define PR_BETA PR_FALSE
+#define PR_VPATCH 5
+#define PR_BETA PR_TRUE
/*
** PRVersionCheck
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index 82cf8b44..943570fc 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -52,15 +52,16 @@
#include <stdlib.h>
/*
- * This release (4.6.4) is backward compatible with the
+ * This release (4.6.5) 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, 4.6.1, 4.6.2,
- * and 4.6.3 releases. It, of course, is compatible with
+ * 4.6.3, and 4.6.4 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", PR_VERSION
+ "4.5", "4.5.1", "4.6", "4.6.1", "4.6.2", "4.6.3",
+ "4.6.4", PR_VERSION
};
/*
@@ -75,7 +76,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.6.5",
+ "4.6.6",
"4.7", "4.7.1",
"10.0", "11.1", "12.14.20"
};