[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, debian, updated. upstream/2.0.dfsg1-58-g988635c

[Russ Allbery]

The following commit has been merged in the debian branch:
commit 92c92cf2fbdf8ad4394daf4d0c54f86e10400e46
Author: Russ Allbery <rra at debian.org>
Date:   Wed Jun 25 16:34:31 2008 -0700

    Add man pages for mdquery and resolvertest

diff --git a/debian/libapache2-mod-shib2.dirs b/debian/libapache2-mod-shib2.dirs
index 17b42d2..436a6ee 100644
--- a/debian/libapache2-mod-shib2.dirs
+++ b/debian/libapache2-mod-shib2.dirs
@@ -1,2 +1,3 @@
 usr/lib/apache2/modules
+usr/share/man/man1
 usr/share/man/man8
diff --git a/debian/man-pages/mdquery.pod b/debian/man-pages/mdquery.pod
new file mode 100644
index 0000000..b51482b
--- /dev/null
+++ b/debian/man-pages/mdquery.pod
@@ -0,0 +1,95 @@
+=head1 NAME
+
+mdquery - Query Shibboleth metadata
+
+=head1 SYNOPSIS
+
+B<mdquery> B<-e> I<entity> [B<-a> I<app>] [B<-nostrict>]
+
+B<mdquery> B<-e> I<entity> B<-r> I<role> B<-p> I<protocol> [B<-a> I<app>]
+    [B<-ns> I<namespace>] [B<-nostrict>]
+
+=head1 DESCRIPTION
+
+B<mdquery> queries and displays Shibboleth SP metadata.  It is primarily a
+debugging tool to use in conjunction with advice from the Shibboleth
+mantaininers.  It can display either the metadata for an entity or the
+metadata for a particular role.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-a> I<app>
+
+Specifies the application ID for which to retrieve metadata.  If not given
+the default is C<default>.
+
+=item B<-e> I<entity>
+
+Specifies the entity ID for which to show metadata.  Normally this is the
+entity descriptor ID for an entity with which one is having a problem
+(such as the entity ID for the local SP).
+
+=item B<-nostrict>
+
+Relax the strictness of checking (such as of expiration dates).
+
+=item B<-ns> I<namespace>
+
+When retrieving metadata for a particular role, specify the namespace.  If
+not given, the default is the SAML20MD namespace.
+
+=item B<-p> I<protocol>
+
+Specify a protocol when retrieving metadata for a particular role.
+Normally one would use the B<-saml10>, B<-saml11>, or B<-saml2> options to
+specify the protocol name, but this option allows an arbitrary protocol to
+be specified.
+
+=item B<-saml10>
+
+Specify a protocol of SAML 1.0.
+
+=item B<-saml11>
+
+Specify a protocol of SAML 1.1.
+
+=item B<-saml2>
+
+Specify a protocol of SAML 2.0.
+
+=item B<-r> I<role>
+
+Retrieve the metadata for a particular role.  Normally one would use the
+B<-idp>, B<-aa>, B<-pdp>, or B<-sp> options to specify the role name, but
+this option allows an arbitrary role to be specified.
+
+=item B<-idp>
+
+Specify a role of IDPSSODescriptor.
+
+=item B<-aa>
+
+Specify a role of AttributeAuthorityDescriptor.
+
+=item B<-pdp>
+
+Specify a role of PDPDescriptor.
+
+=item B<-sp>
+
+Specify a role of SPSSODescriptor.
+
+=back
+
+=head1 AUTHOR
+
+This manual page was written by Russ Allbery for Debian GNU/Linux.
+
+=head1 COPYRIGHT
+
+Copyright 2008 Russ Allbery.  This manual page is hereby placed into the
+public domain by its author.
+
+=cut
diff --git a/debian/man-pages/resolvertest.pod b/debian/man-pages/resolvertest.pod
new file mode 100644
index 0000000..8a216ea
--- /dev/null
+++ b/debian/man-pages/resolvertest.pod
@@ -0,0 +1,69 @@
+=head1 NAME
+
+resolvertest - Test Shibboleth SP attribute resolver
+
+=head1 SYNOPSIS
+
+B<resolvertest> B<-n> I<name> B<-i> I<idp> B<-p> I<protocol>
+    [B<-f> I<format-uri>] [B<-a> I<app>]
+
+B<resolvertest> [B<-a> I<app>] < I<assertion>
+
+=head1 DESCRIPTION
+
+B<resolvertest> queries the Shibboleth SP attribute resolver and can be
+used to test attribute release policies and related configuration for a
+Shibboleth SP.  Either a name, IdP, and protocol may be specified on the
+command-line or B<resolvertest> can take an assertion in XML on standard
+input.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-a> I<app>
+
+The application ID.  If not given, the default is C<default>.
+
+=item B<-i> I<idp>
+
+The Identity Provider to query for attributes.
+
+=item B<-f> I<format-uri>
+
+The URI for the attribute format.
+
+=item B<-n> I<name>
+
+The name to look up.
+
+=item B<-p> I<protocol>
+
+The protocol to use.  Normally, one of the B<-saml10>, B<-saml11>, or
+B<-saml2> options should be used to specify the protocol, but B<-p> can be
+used to specify an arbitrary protocol.
+
+=item B<-saml10>
+
+Use the SAML 1.0 protocol.
+
+=item B<-saml11>
+
+Use the SAML 1.1 protocol.
+
+=item B<-saml2>
+
+Use the SAML 2 protocol.
+
+=back
+
+=head1 AUTHOR
+
+This manual page was written by Russ Allbery for Debian GNU/Linux.
+
+=head1 COPYRIGHT
+
+Copyright 2008 Russ Allbery.  This manual page is hereby placed into the
+public domain by its author.
+
+=cut
diff --git a/debian/shibd.pod b/debian/man-pages/shibd.pod
similarity index 100%
rename from debian/shibd.pod
rename to debian/man-pages/shibd.pod
diff --git a/debian/rules b/debian/rules
index fcab592..52b38e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,8 +92,14 @@ install-stamp:
 	mv $(CURDIR)/debian/tmp/usr/lib/shibboleth/mod_shib_22.so \
 	    $(CURDIR)/debian/libapache2-mod-shib2/usr/lib/apache2/modules
 	rm $(CURDIR)/debian/tmp/usr/lib/shibboleth/mod_shib_22.la
-	pod2man $(CURDIR)/debian/shibd.pod --section 8 --center 'Shibboleth' \
-	    --release 2.0 \
+	pod2man $(CURDIR)/debian/man-pages/mdquery.pod --section 1 \
+	    --center 'Shibboleth' --release 2.0 \
+	    $(CURDIR)/debian/libapache2-mod-shib2/usr/share/man/man1/mdquery.1
+	pod2man $(CURDIR)/debian/man-pages/resolvertest.pod --section 1 \
+	    --center 'Shibboleth' --release 2.0 \
+	    $(CURDIR)/debian/libapache2-mod-shib2/usr/share/man/man1/resolvertest.1
+	pod2man $(CURDIR)/debian/man-pages/shibd.pod --section 8 \
+	    --center 'Shibboleth' --release 2.0 \
 	    $(CURDIR)/debian/libapache2-mod-shib2/usr/share/man/man8/shibd.8
 	dh_install -s -i --fail-missing
 	touch $@

-- 
Debian packaging for the 2.0 Apache Shibboleth SP