[SCM] mapserver branch, master, updated. upstream/6.2.1-72-ga226f0d

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 4a22a26edfb76ae6c8f6ff24580abe2a1e3833bd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jul 4 21:42:38 2013 +0200

    Add man page for legend.

diff --git a/debian/changelog b/debian/changelog
index 19dee84..2986af2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Drop debian-changes-6.2.1-1 from patch series.
   * Update libgd build dependency to libgd-dev for the libgd2 transition.
   * Enable hardening build flags.
+  * Add man page for mapserver utilities:
+    - legend
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/control b/debian/control
index f6044b3..196755e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,9 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), libcurl4-gnutls-dev, li
  libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 3.3.1-1~),
  ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
  sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,
- libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev, 
- libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev
+ libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev,
+ libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev,
+ docbook2x, docbook-xsl, docbook-xml, xsltproc
 Build-Conflicts: libcurl3-openssl-dev
 Homepage: http://www.mapserver.org
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git
diff --git a/debian/man/legend.1.xml b/debian/man/legend.1.xml
new file mode 100644
index 0000000..d108e87
--- /dev/null
+++ b/debian/man/legend.1.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<refentry id='legend'>
+
+  <refmeta>
+    <refentrytitle>legend</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>legend</refname>
+    <refpurpose>generate legend image for mapfile</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv id='synopsis'>
+    <cmdsynopsis>
+      <command>legend</command>
+      <arg choice='plain'><replaceable>mapfile</replaceable></arg>
+      <arg choice='plain'><replaceable>outputfile</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id='description'>
+    <title>DESCRIPTION</title>
+    <para>
+      <command>legend</command> creates a legend image from a mapfile.
+      Output format depends on the graphics library used for rendering.
+    </para>
+  </refsect1>
+
+  <refsect1 id='options'>
+    <title>OPTIONS</title>
+    <variablelist>
+
+      <varlistentry>
+        <term><replaceable>mapfile</replaceable></term>
+        <listitem>
+          <para>Path to the mapfile.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><replaceable>outputfile</replaceable></term>
+        <listitem>
+          <para>Path for the output image file.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
+</refentry>
diff --git a/debian/mapserver-bin.manpages b/debian/mapserver-bin.manpages
new file mode 100644
index 0000000..730bce3
--- /dev/null
+++ b/debian/mapserver-bin.manpages
@@ -0,0 +1 @@
+debian/man/legend.1
diff --git a/debian/rules b/debian/rules
index ca7ae00..a501885 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ CURDIR := $(shell pwd)
 PYVERS=$(shell pyversions -r debian/control)
 RUBYVERS=1.8 1.9.1
 PHP5API=$(shell php-config5 --phpapi)
+MANPAGES:=$(wildcard debian/man/*.*.xml)
 
 # Configure config :
 # Not using non free libpdf
@@ -82,6 +83,12 @@ build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp
 	dh_testdir
 
+	# Create man pages from DocBook XML
+	for x in $(MANPAGES) ; do \
+	  docbook2x-man $$x ; \
+	  mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
+	done
+
 	# Build binary lib
 	$(MAKE) mapscriptvars || touch mapscriptvars
 	$(MAKE)  
@@ -212,6 +219,7 @@ binary-indep: install-indep
 	dh_installdocs -i
 	dh_installexamples -i
 	dh_installdebconf -i
+	dh_installman
 	dh_compress -i -X.xml -X.xsd -X.xsl
 	dh_link -i
 	dh_lintian -i
@@ -230,6 +238,7 @@ binary-arch: install-arch
 	dh_installexamples -a
 	chmod a-x debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml
 	dh_installdebconf -a
+	dh_installman
 	dh_python2 -ppython-mapscript
 	dh_compress -a
 	dh_link -a

-- 
Mapserver