Bump version to 2.2.

diff --git a/config_win32.h b/config_win32.h
index c82a05f..ec2e6af 100644 (file)
--- a/config_win32.h
+++ b/config_win32.h
@@ -64,13 +64,13 @@
 #define PACKAGE_NAME "opensaml"
 
 /* Define to the full name and version of this package. */
 #define PACKAGE_NAME "opensaml"
 
 /* Define to the full name and version of this package. */

-#define PACKAGE_STRING "opensaml 2.1"
+#define PACKAGE_STRING "opensaml 2.2"

 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "opensaml"
 
 /* Define to the version of this package. */
 
 /* 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.1.1"
+#define PACKAGE_VERSION "2.2"

 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */


@@ -83,7 +83,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */

-#define VERSION "2.1.1"
+#define VERSION "2.2"

 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/configure.ac b/configure.ac
index e1490f4..cbfda1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.50])
 AC_PREREQ([2.50])

-AC_INIT([opensaml], [2.1.1], [mace-opensaml-users@internet2.edu], [saml])
+AC_INIT([opensaml], [2.2], [mace-opensaml-users@internet2.edu], [saml])

 AM_CONFIG_HEADER(config.h)
 AM_CONFIG_HEADER(config.h)

-AM_INIT_AUTOMAKE([opensaml], [2.1.1])
+AM_INIT_AUTOMAKE([opensaml], [2.2])

 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)


@@ -236,10 +236,10 @@ AC_CHECK_HEADER([xmltooling/XMLToolingConfig.h],,AC_MSG_ERROR([unable to find xm
 AC_TRY_LINK(
     [#include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/version.h>],
 AC_TRY_LINK(
     [#include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/version.h>],

-    [#if _XMLTOOLING_VERSION >= 10100
+    [#if _XMLTOOLING_VERSION >= 10200

 xmltooling::XMLToolingConfig::getConfig();
 #else
 xmltooling::XMLToolingConfig::getConfig();
 #else

-#error Need XMLTooling version 1.1 or higher
+#error Need XMLTooling version 1.2 or higher

 #endif],
         [AC_DEFINE(HAVE_XMLTOOLING,1,[Define if xmltooling library was found])],
         [AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
 #endif],
         [AC_DEFINE(HAVE_XMLTOOLING,1,[Define if xmltooling library was found])],
         [AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])

diff --git a/depend b/depend
index 510e98d..e869f4f 100644 (file)
--- a/depend
+++ b/depend
@@ -5,6 +5,6 @@ P SHIBxerces xerces-c
 P SHIBxmlsec xml-security-c
        1.4.0
 P SHIBxmltool xmltooling-c
 P SHIBxmlsec xml-security-c
        1.4.0
 P SHIBxmltool xmltooling-c

-       1.1
+       1.2

 P SHIBlog4shib log4shib
     1.0
 P SHIBlog4shib log4shib
     1.0

diff --git a/opensaml.spec.in b/opensaml.spec.in
index d21b7d9..d0c1f87 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -10,7 +10,7 @@ Source0:      %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0
 BuildRequires:  xml-security-c-devel >= 1.4.0
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0
 BuildRequires:  xml-security-c-devel >= 1.4.0

-BuildRequires: xmltooling-devel >= 1.1
+BuildRequires: xmltooling-devel >= 1.2

 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 
 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 


@@ -90,6 +90,9 @@ find $RPM_BUILD_ROOT/%{_bindir} -type f |
 %doc %{_datadir}/doc/%{name}/api
 
 %changelog
 %doc %{_datadir}/doc/%{name}/api
 
 %changelog

+* Tue Sep 23 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.2-1
+- Bumping for minor update.
+

 * Tue Jul 1 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.1-1
 - Bumping for minor update.
 
 * Tue Jul 1 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.1-1
 - Bumping for minor update.
 

diff --git a/saml/saml.rc b/saml/saml.rc
index 4d01496..fdc53bc 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
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r

- FILEVERSION 2,1,1,0\r
- PRODUCTVERSION 2,1,1,0\r
+ FILEVERSION 2,2,0,0\r
+ PRODUCTVERSION 2,2,0,0\r

  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r


@@ -46,23 +46,23 @@ BEGIN
         BEGIN\r
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
         BEGIN\r
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r

-            VALUE "FileDescription", "OpenSAML 2.1.1 Library\0"\r
-            VALUE "FileVersion", "2, 1, 1, 0\0"\r
+            VALUE "FileDescription", "OpenSAML 2.2 Library\0"\r
+            VALUE "FileVersion", "2, 2, 0, 0\0"\r

 #ifdef _DEBUG\r
 #ifdef _DEBUG\r

-            VALUE "InternalName", "saml2_1D\0"\r
+            VALUE "InternalName", "saml2_2D\0"\r

 #else\r
 #else\r

-            VALUE "InternalName", "saml2_1\0"\r
+            VALUE "InternalName", "saml2_2\0"\r

 #endif\r
             VALUE "LegalCopyright", "Copyright © 2008 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef _DEBUG\r
 #endif\r
             VALUE "LegalCopyright", "Copyright © 2008 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef _DEBUG\r

-            VALUE "OriginalFilename", "saml2_1D.dll\0"\r
+            VALUE "OriginalFilename", "saml2_2D.dll\0"\r

 #else\r
 #else\r

-            VALUE "OriginalFilename", "saml2_1.dll\0"\r
+            VALUE "OriginalFilename", "saml2_2.dll\0"\r

 #endif\r
             VALUE "PrivateBuild", "\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r

-            VALUE "ProductName", "OpenSAML 2.1.1\0"\r
-            VALUE "ProductVersion", "2, 1, 1, 0\0"\r
+            VALUE "ProductName", "OpenSAML 2.2\0"\r
+            VALUE "ProductVersion", "2, 2, 0, 0\0"\r

             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index 54cf986..56f1e27 100644 (file)
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -66,7 +66,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"\r

-                               OutputFile="$(OutDir)\$(ProjectName)2_1D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_2D.dll"\r

                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r


@@ -147,7 +147,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"\r

-                               OutputFile="$(OutDir)\$(ProjectName)2_1D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_2D.dll"\r

                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r


@@ -223,7 +223,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"\r

-                               OutputFile="$(OutDir)\$(ProjectName)2_1.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_2.dll"\r

                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r


@@ -302,7 +302,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"\r

-                               OutputFile="$(OutDir)\$(ProjectName)2_1.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_2.dll"\r

                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r

diff --git a/saml/version.h b/saml/version.h
index a5b88ae..326c71e 100644 (file)
--- a/saml/version.h
+++ b/saml/version.h
@@ -38,8 +38,8 @@
  */
 
 #define OPENSAML_VERSION_MAJOR 2
  */
 
 #define OPENSAML_VERSION_MAJOR 2

-#define OPENSAML_VERSION_MINOR 1
-#define OPENSAML_VERSION_REVISION 1
+#define OPENSAML_VERSION_MINOR 2
+#define OPENSAML_VERSION_REVISION 0

 
 /** DO NOT MODIFY BELOW THIS LINE */
 
 
 /** DO NOT MODIFY BELOW THIS LINE */