Reverting version numbers, to 3.18 (3rd) release candidate (RC2), bec…

…ause it's necessary to amend bug 1117897
sailfishos-mirror · Mar 16, 2015 · d976221 · d976221
1 parent c3b2d22
commit d976221
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/lib/nss/nss.h b/lib/nss/nss.h
@@ -33,12 +33,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.18.1" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION  "3.18" _NSS_ECC_STRING _NSS_CUSTOMIZED
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   18
-#define NSS_VPATCH   1
-#define NSS_VBUILD   0
-#define NSS_BETA     PR_TRUE
+#define NSS_VPATCH   0
+#define NSS_VBUILD   2
+#define NSS_BETA     PR_FALSE
 
 #ifndef RC_INVOKED
 

diff --git a/lib/softoken/softkver.h b/lib/softoken/softkver.h
@@ -25,11 +25,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.18.1" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION  "3.18" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   18
-#define SOFTOKEN_VPATCH   1
-#define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_TRUE
+#define SOFTOKEN_VPATCH   0
+#define SOFTOKEN_VBUILD   2
+#define SOFTOKEN_BETA     PR_FALSE
 
 #endif /* _SOFTKVER_H_ */
diff --git a/lib/util/nssutil.h b/lib/util/nssutil.h
@@ -19,12 +19,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.18.1 Beta"
+#define NSSUTIL_VERSION  "3.18"
 #define NSSUTIL_VMAJOR   3
 #define NSSUTIL_VMINOR   18
-#define NSSUTIL_VPATCH   1
-#define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_TRUE
+#define NSSUTIL_VPATCH   0
+#define NSSUTIL_VBUILD   2
+#define NSSUTIL_BETA     PR_FALSE
 
 SEC_BEGIN_PROTOS