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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 1db3d7f020001ce93437f74ec979118cbb23b5d5
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Feb 18 20:33:07 2012 +0100

    Use upstream's httxt2dbm man page

diff --git a/debian/apache2-utils.manpages b/debian/apache2-utils.manpages
index f6deeeb..0b666b5 100644
--- a/debian/apache2-utils.manpages
+++ b/debian/apache2-utils.manpages
@@ -6,7 +6,7 @@ debian/tmp/usr/share/man/man1/htdigest.1
 debian/tmp/usr/share/man/man1/htdbm.1
 debian/tmp/usr/share/man/man1/htpasswd.1
 debian/tmp/usr/share/man/man1/dbmmanage.1
-debian/manpages/httxt2dbm.8
+debian/tmp/usr/share/man/man1/httxt2dbm.1
 debian/manpages/check_forensic.8
 debian/manpages/checkgid.8
 debian/manpages/split-logfile.8
diff --git a/debian/manpages/httxt2dbm.8 b/debian/manpages/httxt2dbm.8
deleted file mode 100644
index 74dd567..0000000
--- a/debian/manpages/httxt2dbm.8
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH "HTTXT2DBM" 8 "2007-06-26" "Apache HTTP Server" "httxt2dbm"
-
-.SH NAME
-httxt2dbm - Generate dbm files for use with RewriteMap
-
-.SH "SYNOPSIS"
- 
-.PP
-\fBhttxt2dbm\fR [ \fB\-v\fR ] [ \fB\-f\fR \fIDBM_TYPE\fR ] \fB\-i\fR \fISOURCE_TXT\fR \fB\-o\fR \fIOUTPUT_DBM\fR 
-
-.SH "SUMMARY"
- 
-.PP
-\fBhttxt2dbm\fR is used to generate dbm files from text input, for use in RewriteMap with the dbm map type.
-
-.SH "OPTIONS"
- 
-.TP
-\-v
-More verbose output
-.TP
-\-f \fIDBM_TYPE\fR
-Specify the DBM type to be used for the output. If not specified, will use the APR Default. Available types are:
- GDBM for GDBM files
- SDBM for SDBM files
- DB for berkeley DB files
- NDBM for NDBM files
- default for the default DBM type 
-.TP
-\-i \fISOURCE_TXT\fR
-Input file from which the dbm is to be created. The file should be formated with one record per line, of the form:
- key value
-See the documentation for RewriteMap for further details of this file's format and meaning. 
-.TP
-\-o \fIOUTPUT_DBM\fR
-Name of the output dbm files.
-
-.SH "EXAMPLES"
-httxt2dbm \-i rewritemap.txt \-o rewritemap.dbm
-
-httxt2dbm \-f SDBM \-i rewritemap.txt \-o rewritemap.dbm

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