Set version numbers to 3.60 Beta

6 files changed, 7 insertions, 21 deletions

diff --git a/automation/abi-check/expected-report-libnss3.so.txt b/automation/abi-check/expected-report-libnss3.so.txt
index 36059f505..e69de29bb 100644
--- a/automation/abi-check/expected-report-libnss3.so.txt
+++ b/automation/abi-check/expected-report-libnss3.so.txt
@@ -1,8 +0,0 @@
-
-4 Added functions:
-
-  [A] 'function SECStatus CERT_AddCertToListHeadWithData(CERTCertList*, CERTCertificate*, void*)'    {CERT_AddCertToListHeadWithData@@NSS_3.59}
-  [A] 'function SECStatus CERT_AddCertToListTailWithData(CERTCertList*, CERTCertificate*, void*)'    {CERT_AddCertToListTailWithData@@NSS_3.59}
-  [A] 'function PK11SymKey* PK11_PubUnwrapSymKeyWithMechanism(SECKEYPrivateKey*, CK_MECHANISM_TYPE, SECItem*, SECItem*, CK_MECHANISM_TYPE, CK_ATTRIBUTE_TYPE, int)'    {PK11_PubUnwrapSymKeyWithMechanism@@NSS_3.59}
-  [A] 'function SECStatus PK11_PubWrapSymKeyWithMechanism(SECKEYPublicKey*, CK_MECHANISM_TYPE, SECItem*, PK11SymKey*, SECItem*)'    {PK11_PubWrapSymKeyWithMechanism@@NSS_3.59}
-
diff --git a/automation/abi-check/expected-report-libnssutil3.so.txt b/automation/abi-check/expected-report-libnssutil3.so.txt
index 92961214f..e69de29bb 100644
--- a/automation/abi-check/expected-report-libnssutil3.so.txt
+++ b/automation/abi-check/expected-report-libnssutil3.so.txt
@@ -1,6 +0,0 @@
-
-2 Added functions:
-
-  [A] 'function PRBool NSS_IsPolicyLocked()'    {NSS_IsPolicyLocked@@NSSUTIL_3.59}
-  [A] 'function void NSS_LockPolicy()'    {NSS_LockPolicy@@NSSUTIL_3.59}
-
diff --git a/automation/abi-check/previous-nss-release b/automation/abi-check/previous-nss-release
index a37de0565..6678803c3 100644
--- a/automation/abi-check/previous-nss-release
+++ b/automation/abi-check/previous-nss-release
@@ -1 +1 @@
-NSS_3_58_BRANCH
+NSS_3_59_BRANCH
diff --git a/lib/nss/nss.h b/lib/nss/nss.h
index 76357aa49..a32a05afc 100644
--- a/lib/nss/nss.h
+++ b/lib/nss/nss.h
@@ -22,9 +22,9 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION "3.59" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.60" _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR 3
-#define NSS_VMINOR 59
+#define NSS_VMINOR 60
 #define NSS_VPATCH 0
 #define NSS_VBUILD 0
 #define NSS_BETA PR_TRUE
diff --git a/lib/softoken/softkver.h b/lib/softoken/softkver.h
index 104511bca..a21752538 100644
--- a/lib/softoken/softkver.h
+++ b/lib/softoken/softkver.h
@@ -17,9 +17,9 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION "3.59" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.60" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 59
+#define SOFTOKEN_VMINOR 60
 #define SOFTOKEN_VPATCH 0
 #define SOFTOKEN_VBUILD 0
 #define SOFTOKEN_BETA PR_TRUE
diff --git a/lib/util/nssutil.h b/lib/util/nssutil.h
index 17ee1316e..046cee0cd 100644
--- a/lib/util/nssutil.h
+++ b/lib/util/nssutil.h
@@ -19,9 +19,9 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION "3.59 Beta"
+#define NSSUTIL_VERSION "3.60 Beta"
 #define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 59
+#define NSSUTIL_VMINOR 60
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
 #define NSSUTIL_BETA PR_TRUE