[SCM] Debian packaging for OpenSAML branch, master, updated. debian/1.1.1-3-13-gbd24a5d

[Russ Allbery]

The following commit has been merged in the master branch:
commit 0b56aebb44f816eb267df3bc8bb8defc2b70e6d7
Merge: 95569ebf6cb4545e0497f958eab6f2c203d5471f 2c7c1282490fc2da5e8916b57e2f6fb949a9a7aa
Author: Russ Allbery <rra at debian.org>
Date:   Sun Jun 21 13:26:23 2009 -0700

    Merge commit 'upstream/1.1.2'

diff --combined configure.ac
index 556df62,80e6ac0..de359f3
--- a/configure.ac
+++ b/configure.ac
@@@ -1,8 -1,8 +1,8 @@@
  AC_PREREQ([2.50])
- AC_INIT([opensaml], [1.1.1], [mace-opensaml-users at internet2.edu], [saml])
+ AC_INIT([opensaml], [1.1.2], [mace-opensaml-users at internet2.edu], [saml])
  AM_CONFIG_HEADER(config.h)
  AM_CONFIG_HEADER(saml/config_pub.h)
- AM_INIT_AUTOMAKE([opensaml], [1.1.1])
+ AM_INIT_AUTOMAKE([opensaml], [1.1.2])
  
  sinclude(acx_pthread.m4)
  
@@@ -58,7 -58,6 +58,7 @@@ AC_STRUCT_TIMEZON
  AC_FUNC_STRFTIME
  AC_CHECK_FUNCS([strchr strdup strstr gmtime_r timegm])
  AC_CHECK_HEADERS([dlfcn.h])
 +AC_SEARCH_LIBS([dlopen], [dl])
  
  # OpenSSL settings
  AC_PATH_PROG(PKG_CONFIG, pkg-config)
@@@ -175,13 -174,13 +175,13 @@@ AC_CHECK_HEADER([xercesc/dom/DOM.hpp],
  AC_MSG_CHECKING([Xerces version])
  AC_PREPROC_IFELSE(
  	[AC_LANG_PROGRAM([#include <xercesc/util/XercesVersion.hpp>],
- [#if  _XERCES_VERSION != 20600
+ [#if  _XERCES_VERSION != 20600 && _XERCES_VERSION < 30000 
  int i = 0;
  #else
- #error cannot use version 2.6.0
+ #error cannot use version 2.6.0 or 3.x
  #endif])],
  	[AC_MSG_RESULT(OK)],
- 	[AC_MSG_FAILURE([Xerces-C v2.6.0 has bugs that inhibit use with signed XML, please use special 2.6.1 tarball provided by Shibboleth Project])])
+ 	[AC_MSG_FAILURE([Found unsupported Xerces-C version.])])
  AC_TRY_LINK(
          [#include <xercesc/util/PlatformUtils.hpp>],
          [xercesc::XMLPlatformUtils::Initialize()],

-- 
Debian packaging for OpenSAML