[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 11e1ce03cb975f75588c2e61b94301c1187a6556

[Arno Töll]

The following commit has been merged in the next branch:
commit 11e1ce03cb975f75588c2e61b94301c1187a6556
Author: Arno Töll <debian at toell.net>
Date:   Sun Mar 18 01:43:50 2012 +0100

    Add manpage for a2query, add links to dh_apache2's manpage

diff --git a/debian/a2query.in b/debian/a2query.in
index ac21c23..1308659 100755
--- a/debian/a2query.in
+++ b/debian/a2query.in
@@ -41,6 +41,13 @@ use feature "switch";
 use strict;
 use Getopt::Std;
 
+=head1 NAME
+
+a2query - retrieve runtime configuration from a local Apache 2 HTTP server
+
+=cut
+
+
 our $APACHE2 = "apache2ctl";
 our $API = "__API__";
 our $MODULE_DIR = "__MODULE_DIR__";
@@ -52,6 +59,70 @@ our @CONFS = ();
 our @SITES =();
 our @HELP = ();
 
+=head1 SYNOPSIS
+
+B<a2query>  [S<-m> [I<MODULE>]] [S<-s> [I<SITE>]] [S<-c> [I<CONF>]] [S<-a>] [S<-v>]
+[S<-M>] [S<-d>] [S<-h>]
+
+=head1 DESCRIPTION
+
+B<a2query> is a program designed to retrieve configuration values from a locally
+available Apache 2 HTTP web server. It was designed to be as robust as possible
+by returning feasible values even if the Apache 2 syntax validator fails.
+
+This program is primarily meant to be used from maintainer scripts.
+
+=head1 OPTIONS
+
+=over 4
+
+=item S<-a>
+
+Returns the Apache 2 "Module Magic Version" (API version) number, the server was
+compiled with. The returned version does not contain any minor versions which
+are known to be compatible with the major version returned.
+
+=item S<-c> [I<CONF>]
+
+Checks whether the configuration I<CONF> is enabled. If no argument was given,
+all enabled configuration files are being returned. I<CONF> is evaluated as
+L<perl>(1) compatible regular expression.
+
+=item S<-h>
+
+Displays a brief summary how the program can be called and exits.
+
+=item S<-m> [I<MODULE>]
+
+Checks whether the module I<MODULE> is enabled, The argument is interpreted in
+the same way, as for configuration files queried by the S<-c> switch.
+
+=item S<-M>
+
+Returns the currently enabled Apache 2 MPM (Multi Processing Module).
+
+=item S<-s> [I<SITE>]
+
+Checks whether the module I<SITE> is enabled, The argument is interpreted in
+the same way, as for configuration files queried by the S<-c> switch.
+
+
+=item S<-v>
+
+returns the currently installed Apache 2 HTTP server version
+
+=back
+
+=head1 SEE ALSO
+
+L<apache2ctl>(8), L<apache2>(8), L<perl>(1)
+
+=head1 AUTHOR
+
+This manual and L<a2query> was written by Arno Toell <debian at toell.net>.
+
+=cut
+
 sub fail
 {
 	my $reason = shift;
diff --git a/debian/apache2.manpages b/debian/apache2.manpages
index d5f0c8d..cd9ece6 100644
--- a/debian/apache2.manpages
+++ b/debian/apache2.manpages
@@ -6,3 +6,4 @@ debian/manpages/a2dismod.8
 debian/manpages/a2ensite.8
 debian/manpages/a2enconf.8
 debian/manpages/a2disconf.8
+debian/manpages/a2query.8
diff --git a/debian/clean b/debian/clean
index 45e073c..4d45125 100644
--- a/debian/clean
+++ b/debian/clean
@@ -12,5 +12,6 @@ debian/apache2-suexec-pristine.dirs
 debian/apache2-suexec-pristine.lintian-overrides
 debian/a2query
 debian/manpages/dh_apache2.1
+debian/manpages/a2query.8
 support/suexec-custom.c
 config.nice
diff --git a/debian/debhelper/dh_apache2 b/debian/debhelper/dh_apache2
index c3c8458..ff278fc 100755
--- a/debian/debhelper/dh_apache2
+++ b/debian/debhelper/dh_apache2
@@ -286,6 +286,10 @@ configuration for a fictional site configuration for the site I<example.com>:
  conf debian/foo.conf
  site debian/example_com.conf
 
+=head1 SEE ALSO
+
+L<apache2ctl>(8), L<a2query>(8), L<debhelper>(7), L<dh>(1)
+
 =head1 AUTHOR
 
 This manual and L<dh_apache2> was written by Arno Toell <debian at toell.net>.
diff --git a/debian/rules b/debian/rules
index 545e7ca..441f0f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,6 +104,7 @@ override_dh_installchangelogs:
 override_dh_installman:
 	mv debian/tmp/usr/share/man/man8/suexec.8 debian/tmp/usr/share/man/man8/suexec-pristine.8
 	pod2man debian/debhelper/dh_apache2 > debian/manpages/dh_apache2.1
+	pod2man debian/a2query.in > debian/manpages/a2query.8
 	dh_installman
 
 override_dh_strip:

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)