From 390147dc17687e900bf6a50f3577ccc611a0a7cd Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Sun, 5 Jul 2015 19:39:36 +0000
Subject: [PATCH] Version bump

---
 config_win32.h   |  8 ++++----
 configure.ac     |  2 +-
 saml/Makefile.am |  2 +-
 saml/saml.rc     | 10 +++++-----
 saml/version.h   |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config_win32.h b/config_win32.h
index 53edbfe..cbead59 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.4"
+#define PACKAGE_STRING "opensaml 2.5.5"
 
 /* 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.4"
+#define PACKAGE_VERSION "2.5.5"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -106,10 +106,10 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "2.5.4"
+#define VERSION "2.5.5"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
\ No newline at end of file
+/* #undef size_t */
diff --git a/configure.ac b/configure.ac
index 57c373a..a4e291f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([opensaml],[2.5.4],[https://issues.shibboleth.net/],[opensaml])
+AC_INIT([opensaml],[2.5.5],[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 fa28766..76b1393 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:4:0
+libsaml_la_LDFLAGS = -version-info 8:5: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 933cb7d..149cb2a 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,4,0
- PRODUCTVERSION 2,5,4,0
+ FILEVERSION 2,5,5,0
+ PRODUCTVERSION 2,5,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,7 +47,7 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "OpenSAML Library\0"
-            VALUE "FileVersion", "2, 5, 4, 0\0"
+            VALUE "FileVersion", "2, 5, 5, 0\0"
 #ifdef _DEBUG
             VALUE "InternalName", "saml2_5D\0"
 #else
@@ -61,8 +61,8 @@ BEGIN
             VALUE "OriginalFilename", "saml2_5.dll\0"
 #endif
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "OpenSAML 2.5.4\0"
-            VALUE "ProductVersion", "2, 5, 4, 0\0"
+            VALUE "ProductName", "OpenSAML 2.5.5\0"
+            VALUE "ProductVersion", "2, 5, 5, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/saml/version.h b/saml/version.h
index ffdde81..086f671 100644
--- a/saml/version.h
+++ b/saml/version.h
@@ -44,7 +44,7 @@
 
 #define OPENSAML_VERSION_MAJOR 2
 #define OPENSAML_VERSION_MINOR 5
-#define OPENSAML_VERSION_REVISION 4
+#define OPENSAML_VERSION_REVISION 5
 
 /** DO NOT MODIFY BELOW THIS LINE */
 
-- 
2.1.4