From 7efda6ea0b243078dbafac469b25b99d821d06c6 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Tue, 3 May 2016 11:28:48 -0400 Subject: [PATCH] Bump version to 2.6.0 and adjust soname and DLL name. --- Projects/vc10/saml/saml.vcxproj | 8 ++++---- Projects/vc14/saml/saml.vcxproj | 8 ++++---- config_win32.h | 6 +++--- configure.ac | 2 +- saml/Makefile.am | 2 +- saml/saml.rc | 18 +++++++++--------- saml/version.h | 4 ++-- samlsign/samlsign.rc | 10 +++++----- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Projects/vc10/saml/saml.vcxproj b/Projects/vc10/saml/saml.vcxproj index c09f1c5..df88d15 100644 --- a/Projects/vc10/saml/saml.vcxproj +++ b/Projects/vc10/saml/saml.vcxproj @@ -87,10 +87,10 @@ AllRules.ruleset - $(ProjectName)2_5D - $(ProjectName)2_5D - $(ProjectName)2_5 - $(ProjectName)2_5 + $(ProjectName)2_6D + $(ProjectName)2_6D + $(ProjectName)2_6 + $(ProjectName)2_6 diff --git a/Projects/vc14/saml/saml.vcxproj b/Projects/vc14/saml/saml.vcxproj index 235dff7..a9b1149 100644 --- a/Projects/vc14/saml/saml.vcxproj +++ b/Projects/vc14/saml/saml.vcxproj @@ -91,10 +91,10 @@ AllRules.ruleset - $(ProjectName)2_5D - $(ProjectName)2_5D - $(ProjectName)2_5 - $(ProjectName)2_5 + $(ProjectName)2_6D + $(ProjectName)2_6D + $(ProjectName)2_6 + $(ProjectName)2_6 diff --git a/config_win32.h b/config_win32.h index cbead59..7ff1fd9 100644 --- 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 --- 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 --- 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 --- a/saml/saml.rc +++ b/saml/saml.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,1 - PRODUCTVERSION 2,5,5,0 + FILEVERSION 2,6,0,0 + PRODUCTVERSION 2,6,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,22 +47,22 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Shibboleth Consortium\0" VALUE "FileDescription", "OpenSAML Library\0" - VALUE "FileVersion", "2, 5, 5, 1\0" + VALUE "FileVersion", "2, 6, 0, 0\0" #ifdef _DEBUG - VALUE "InternalName", "saml2_5D\0" + VALUE "InternalName", "saml2_6D\0" #else - VALUE "InternalName", "saml2_5\0" + VALUE "InternalName", "saml2_6\0" #endif VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" VALUE "LegalTrademarks", "\0" #ifdef _DEBUG - VALUE "OriginalFilename", "saml2_5D.dll\0" + VALUE "OriginalFilename", "saml2_6D.dll\0" #else - VALUE "OriginalFilename", "saml2_5.dll\0" + VALUE "OriginalFilename", "saml2_6.dll\0" #endif VALUE "PrivateBuild", "\0" - VALUE "ProductName", "OpenSAML 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" + VALUE "ProductName", "OpenSAML 2.6.0\0" + VALUE "ProductVersion", "2, 6, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/saml/version.h b/saml/version.h index 086f671..28b6f92 100644 --- 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 --- a/samlsign/samlsign.rc +++ b/samlsign/samlsign.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,5,1 - PRODUCTVERSION 2,5,5,0 + FILEVERSION 2,6,0,0 + PRODUCTVERSION 2,6,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,14 +47,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Shibboleth Consortium\0" VALUE "FileDescription", "OpenSAML Signature Utility\0" - VALUE "FileVersion", "2, 5, 5, 1\0" + VALUE "FileVersion", "2, 6, 0, 0\0" VALUE "InternalName", "samlsign\0" VALUE "LegalCopyright", "Copyright © 2016 UCAID\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "samlsign.exe\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "OpenSAML 2.5.5\0" - VALUE "ProductVersion", "2, 5, 5, 0\0" + VALUE "ProductName", "OpenSAML 2.6.0\0" + VALUE "ProductVersion", "2, 6, 0, 0\0" VALUE "SpecialBuild", "\0" END END -- 2.1.4