Bump version to 2.6.0 and adjust soname and DLL name.

diff --git a/Projects/vc10/saml/saml.vcxproj b/Projects/vc10/saml/saml.vcxproj
index c09f1c5..df88d15 100644 (file)
--- a/Projects/vc10/saml/saml.vcxproj
+++ b/Projects/vc10/saml/saml.vcxproj
@@ -87,10 +87,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)2_5D</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_5D</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)2_5</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_5</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)2_6D</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_6D</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)2_6</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_6</TargetName>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r

diff --git a/Projects/vc14/saml/saml.vcxproj b/Projects/vc14/saml/saml.vcxproj
index 235dff7..a9b1149 100644 (file)
--- a/Projects/vc14/saml/saml.vcxproj
+++ b/Projects/vc14/saml/saml.vcxproj
@@ -91,10 +91,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)2_5D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_5D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)2_5</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_5</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)2_6D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_6D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)2_6</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_6</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/config_win32.h b/config_win32.h
index cbead59..7ff1fd9 100644 (file)
--- a/config_win32.h
+++ b/config_win32.h
@@ -87,13 +87,13 @@
 #define PACKAGE_NAME "opensaml"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "opensaml 2.5.5"
+#define PACKAGE_STRING "opensaml 2.6.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "opensaml"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.5"
+#define PACKAGE_VERSION "2.6.0"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -106,7 +106,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "2.5.5"
+#define VERSION "2.6.0"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/configure.ac b/configure.ac
index a4e291f..b09de69 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([opensaml],[2.5.5],[https://issues.shibboleth.net/],[opensaml])
+AC_INIT([opensaml],[2.6.0],[https://issues.shibboleth.net/],[opensaml])
 AC_CONFIG_SRCDIR(saml)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 76b1393..c550bd6 100644 (file)
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -191,7 +191,7 @@ libsaml_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libsaml_la_LDFLAGS = -version-info 8:5:0
+libsaml_la_LDFLAGS = -version-info 9:0:0
 
 install-exec-hook:
        for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done

diff --git a/saml/saml.rc b/saml/saml.rc
index e320712..67ab5e4 100644 (file)
--- a/saml/saml.rc
+++ b/saml/saml.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,5,1\r
- PRODUCTVERSION 2,5,5,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,22 +47,22 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "OpenSAML Library\0"\r
-            VALUE "FileVersion", "2, 5, 5, 1\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "saml2_5D\0"\r
+            VALUE "InternalName", "saml2_6D\0"\r
 #else\r
-            VALUE "InternalName", "saml2_5\0"\r
+            VALUE "InternalName", "saml2_6\0"\r
 #endif\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "saml2_5D.dll\0"\r
+            VALUE "OriginalFilename", "saml2_6D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "saml2_5.dll\0"\r
+            VALUE "OriginalFilename", "saml2_6.dll\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "OpenSAML 2.5.5\0"\r
-            VALUE "ProductVersion", "2, 5, 5, 0\0"\r
+            VALUE "ProductName", "OpenSAML 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/saml/version.h b/saml/version.h
index 086f671..28b6f92 100644 (file)
--- a/saml/version.h
+++ b/saml/version.h
@@ -43,8 +43,8 @@
  */
 
 #define OPENSAML_VERSION_MAJOR 2
-#define OPENSAML_VERSION_MINOR 5
-#define OPENSAML_VERSION_REVISION 5
+#define OPENSAML_VERSION_MINOR 6
+#define OPENSAML_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */
 

diff --git a/samlsign/samlsign.rc b/samlsign/samlsign.rc
index 267cec2..f2644e5 100644 (file)
--- a/samlsign/samlsign.rc
+++ b/samlsign/samlsign.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,5,5,1\r
- PRODUCTVERSION 2,5,5,0\r
+ FILEVERSION 2,6,0,0\r
+ PRODUCTVERSION 2,6,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Shibboleth Consortium\0"\r
             VALUE "FileDescription", "OpenSAML Signature Utility\0"\r
-            VALUE "FileVersion", "2, 5, 5, 1\0"\r
+            VALUE "FileVersion", "2, 6, 0, 0\0"\r
             VALUE "InternalName", "samlsign\0"\r
             VALUE "LegalCopyright", "Copyright © 2016 UCAID\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "samlsign.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "OpenSAML 2.5.5\0"\r
-            VALUE "ProductVersion", "2, 5, 5, 0\0"\r
+            VALUE "ProductName", "OpenSAML 2.6.0\0"\r
+            VALUE "ProductVersion", "2, 6, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r