Merge in upstream/2.4+dfsg into experimental.

[shibboleth/sp.git] / shibsp / shibsp.rc

diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index c503f8b..e4a5b72 100644 (file)
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,3,1,0\r
- PRODUCTVERSION 2,3,1,0\r
+ FILEVERSION 1,4,0,0\r
+ PRODUCTVERSION 2,4,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -51,38 +51,38 @@ BEGIN
 #else\r
             VALUE "FileDescription", "Shibboleth SP Library\0"\r
 #endif\r
-            VALUE "FileVersion", "1, 3, 0, 0\0"\r
+            VALUE "FileVersion", "1, 4, 0, 0\0"\r
 #ifdef SHIBSP_LITE\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "shibsp-lite1_3D\0"\r
+            VALUE "InternalName", "shibsp-lite1_4D\0"\r
 #else\r
-            VALUE "InternalName", "shibsp-lite1_3\0"\r
+            VALUE "InternalName", "shibsp-lite1_4\0"\r
 #endif\r
 #else\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "shibsp1_3D\0"\r
+            VALUE "InternalName", "shibsp1_4D\0"\r
 #else\r
-            VALUE "InternalName", "shibsp1_3\0"\r
+            VALUE "InternalName", "shibsp1_4\0"\r
 #endif\r
 #endif\r
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef SHIBSP_LITE\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "shibsp-lite1_3D.dll\0"\r
+            VALUE "OriginalFilename", "shibsp-lite1_4D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "shibsp-lite1_3.dll\0"\r
+            VALUE "OriginalFilename", "shibsp-lite1_4.dll\0"\r
 #endif\r
 #else\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "shibsp1_3D.dll\0"\r
+            VALUE "OriginalFilename", "shibsp1_4D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "shibsp1_3.dll\0"\r
+            VALUE "OriginalFilename", "shibsp1_4.dll\0"\r
 #endif\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.3.1\0"\r
-            VALUE "ProductVersion", "2, 3, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.4\0"\r
+            VALUE "ProductVersion", "2, 4, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r