summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2007-04-27 20:01:02 +0000
committerwtc%google.com <devnull@localhost>2007-04-27 20:01:02 +0000
commitc885a42b3d79e813f79c32aa560fb535c925a2f9 (patch)
treec212b612a04523a5cae63ec9d821c600981be6c7
parent02d085f6ed24138a27f5217de6884c052c6ee36a (diff)
downloadnspr-hg-c885a42b3d79e813f79c32aa560fb535c925a2f9.tar.gz
Set NSPR version to 4.6.7 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.c10
5 files changed, 14 insertions, 14 deletions
diff --git a/admin/repackage.sh b/admin/repackage.sh
index 01d0ce3f..e9016cc2 100755
--- a/admin/repackage.sh
+++ b/admin/repackage.sh
@@ -64,10 +64,10 @@
#
# ------------------------------------------------------------------
-FROMTOP=/share/builds/components/nspr20/v4.6.6
-TOTOP=./v4.6.6
-NSPRDIR=nspr-4.6.6
-SOURCETAG=NSPR_4_6_6_RTM
+FROMTOP=/share/builds/components/nspr20/v4.6.7
+TOTOP=./v4.6.7
+NSPRDIR=nspr-4.6.7
+SOURCETAG=NSPR_4_6_7_RTM
#
# enumerate Unix object directories on /s/b/c
diff --git a/configure b/configure
index a710ff97..f53e9298 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=6
+MOD_PATCH_VERSION=7
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/configure.in b/configure.in
index 2b6ebf8e..98295583 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=6
+MOD_PATCH_VERSION=7
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/pr/include/prinit.h b/pr/include/prinit.h
index d9743aba..2188d359 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.6"
+#define PR_VERSION "4.6.7 Beta"
#define PR_VMAJOR 4
#define PR_VMINOR 6
-#define PR_VPATCH 6
-#define PR_BETA PR_FALSE
+#define PR_VPATCH 7
+#define PR_BETA PR_TRUE
/*
** PRVersionCheck
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index a9e45efa..8f458bbb 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -52,16 +52,16 @@
#include <stdlib.h>
/*
- * This release (4.6.6) is backward compatible with the
+ * This release (4.6.7) 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,
- * 4.6.3, 4.6.4, and 4.6.5 releases. It, of course, is compatible
- * with itself.
+ * 4.6.3, 4.6.4, 4.6.5, and 4.6.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", "4.6", "4.6.1", "4.6.2", "4.6.3",
- "4.6.4", "4.6.5", PR_VERSION
+ "4.6.4", "4.6.5", "4.6.6", PR_VERSION
};
/*
@@ -76,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.7",
+ "4.6.8",
"4.7", "4.7.1",
"10.0", "11.1", "12.14.20"
};