Set version numbers to 3.21.1, and remove some unnecessary duplicate …

…tags.
sailfishos-mirror · Nov 9, 2015 · be55989 · be55989
1 parent 5212132
commit be55989
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/.hgtags b/.hgtags
@@ -1558,7 +1558,4 @@ ae72d76f8d2472505b499c498191c3ce441b6a17 NSS_3_19_1_BETA1
 6e60855257f0f3d34cb51cdd2aba1800b7834f7f NSS_3_21_Beta1
 dc5a3f75d9d5d0fc6dd5f5b60b5b9be693dbbc78 NSS_3_21_Beta2
 feae8cff7fed6f450b8136af59e7f50e448a5c12 NSS_3_21_Beta3
-24d142d9e229eb96265e5565c437acccb1d2ca15 NSS_3_21_RTM
-24d118f3c692d770f6fb42b8838319e5e8fc6cb3 NSS_3_21_RTM
-24d118f3c692d770f6fb42b8838319e5e8fc6cb3 NSS_3_21_RTM
 507694132f6f0706e7b8e33dac63a560a89f67fc NSS_3_21_RTM
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.21" _NSS_ECC_STRING _NSS_CUSTOMIZED
+#define NSS_VERSION  "3.21.1" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   21
-#define NSS_VPATCH   0
+#define NSS_VPATCH   1
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_FALSE
+#define NSS_BETA     PR_TRUE
 
 #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.21" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION  "3.21.1" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   21
-#define SOFTOKEN_VPATCH   0
+#define SOFTOKEN_VPATCH   1
 #define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_FALSE
+#define SOFTOKEN_BETA     PR_TRUE
 
 #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.21"
+#define NSSUTIL_VERSION  "3.21.1 Beta"
 #define NSSUTIL_VMAJOR   3
 #define NSSUTIL_VMINOR   21
-#define NSSUTIL_VPATCH   0
+#define NSSUTIL_VPATCH   1
 #define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_FALSE
+#define NSSUTIL_BETA     PR_TRUE
 
 SEC_BEGIN_PROTOS