Merge branch 'upstream' into debian

Conflicts:
	configs/Makefile.am
	configs/Makefile.in
	shibsp/paths.h

diff --cc configs/Makefile.am
Simple merge

diff --cc configs/Makefile.in
Simple merge

diff --cc configs/shibd-debian.in
index 6505f9f,13e8240..61fbb7a
--- 1/configs/shibd-debian.in
--- 2/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@@ -4,11 -4,11 +4,11 @@@
  # Required-Start: $local_fs $remote_fs $network
  # Required-Stop: $local_fs $remote_fs $network
  # Default-Start: 2 3 4 5
- # Default-Stop: S 0 1 6
+ # Default-Stop: 0 1 6
  # Short-Description: Shibboleth 2 Service Provider Daemon
  # Description: Starts the separate daemon used by the Shibboleth
 -# Apache module to manage sessions and to retrieve
 -# attributes from Shibboleth Identity Providers.
 +#              Apache module to manage sessions and to retrieve
 +#              attributes from Shibboleth Identity Providers.
  ### END INIT INFO
  #
  # Written by Quanah Gibson-Mount <quanah@stanford.edu>

diff --cc shibsp/paths.h
index cd361ea,6eb507d..6ad2036
--- 1/shibsp/paths.h
--- 2/shibsp/paths.h
+++ b/shibsp/paths.h
@@@ -23,24 -23,31 +23,31 @@@
  #ifndef __shibsp_paths_h__\r
  #define __shibsp_paths_h__\r
  \r
- /**\r
-  * Default schema catalogs.\r
-  */\r
+ /** Default schema catalogs. */\r
 -#define SHIBSP_SCHEMAS "/opt/shibboleth-sp/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/opt/shibboleth-sp/share/xml/shibboleth/catalog.xml"\r
 +#define SHIBSP_SCHEMAS "/usr/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/usr/share/xml/shibboleth/catalog.xml"\r
  \r
- /**\r
-  * Default name of SP configuration file.\r
-  */\r
+ /** Default name of SP configuration file. */\r
  #define SHIBSP_CONFIG "shibboleth2.xml"\r
  \r
- /**\r
-  * Default name of SP console tool logging file.\r
-  */\r
+ /** Default name of SP console tool logging file. */\r
  #define SHIBSP_LOGGING "console.logger"\r
  \r
- /**\r
-  * Default prefix for installation (used to resolve relative paths).\r
-  */\r
+ /** Default prefix for installation (used to resolve relative paths). */\r
 -#define SHIBSP_PREFIX  "/opt/shibboleth-sp"\r
 +#define SHIBSP_PREFIX  "/usr"\r
  \r
 -#define SHIBSP_LIBDIR  "/opt/shibboleth-sp/lib"\r
+ /** Library directory for installation (used to resolve relative paths). */\r
 -#define SHIBSP_LOGDIR  "/opt/shibboleth-sp/var/log"\r
++#define SHIBSP_LIBDIR  "/usr/lib"\r
+ \r
+ /** Log directory for installation (used to resolve relative paths). */\r
 -#define SHIBSP_CFGDIR  "/opt/shibboleth-sp/etc"\r
++#define SHIBSP_LOGDIR  "/var/log/shibboleth"\r
+ \r
+ /** Configuration directory for installation (used to resolve relative paths). */\r
 -#define SHIBSP_RUNDIR  "/opt/shibboleth-sp/var/run"\r
++#define SHIBSP_CFGDIR  "/etc/shibboleth"\r
+ \r
+ /** Runtime state directory for installation (used to resolve relative paths). */\r
 -#define SHIBSP_XMLDIR  "/opt/shibboleth-sp/share/xml"\r
++#define SHIBSP_RUNDIR  "/var/run/shibboleth"\r
+ \r
+ /** XML directory for installation (used to resolve relative paths). */\r
++#define SHIBSP_XMLDIR  "/usr/share/xml/shibboleth"\r
+ \r
  #endif /* __shibsp_paths_h__ */\r