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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit c35ad6d5fac070989025e0eccfceee23a75b7a18
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 5 16:33:04 2013 +0200

    Add man page for scalebar.

diff --git a/debian/changelog b/debian/changelog
index fd9d466..df3b59f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Add man page for mapserver utilities:
     - legend
     - msencrypt
+    - scalebar
     - shp2img
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 14 Jun 2013 22:00:07 +0200
diff --git a/debian/man/legend.1.xml b/debian/man/legend.1.xml
index d108e87..39bf6f3 100644
--- a/debian/man/legend.1.xml
+++ b/debian/man/legend.1.xml
@@ -50,4 +50,13 @@
 
   </refsect1>
 
+  <refsect1 id='see-also'>
+    <title>SEE ALSO</title>
+
+    <citerefentry>
+      <refentrytitle>scalebar</refentrytitle>
+      <manvolnum>1</manvolnum>
+    </citerefentry>
+  </refsect1>
+
 </refentry>
diff --git a/debian/man/scalebar.1.xml b/debian/man/scalebar.1.xml
new file mode 100644
index 0000000..b729f0e
--- /dev/null
+++ b/debian/man/scalebar.1.xml
@@ -0,0 +1,64 @@
+<?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='scalebar'>
+
+  <refmeta>
+    <refentrytitle>scalebar</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>scalebar</refname>
+    <refpurpose>create a scalebar from a mapfile</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv id='synopsis'>
+    <cmdsynopsis>
+      <command>scalebar</command>
+      <group>
+        <arg choice='plain'><replaceable>mapfile</replaceable> <replaceable>outputimage</replaceable></arg>
+        <arg choice='opt'>-v</arg>
+      </group>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id='description'>
+    <title>DESCRIPTION</title>
+    <para>
+      <command>scalebar</command> creates a scalebar from a mapfile. Output is
+      either PNG or GIF depending on what version of the GD library used.
+    </para>
+  </refsect1>
+
+  <refsect1 id='options'>
+    <title>OPTIONS</title>
+    <variablelist>
+
+      <varlistentry>
+        <term><replaceable>mapfile</replaceable> <replaceable>outputimage</replaceable></term>
+        <listitem>
+          <para>Creates a scalebar from a mapfile.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-v</term>
+        <listitem>
+          <para>Display mapserver version and build options.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
+  <refsect1 id='see-also'>
+    <title>SEE ALSO</title>
+
+    <citerefentry>
+      <refentrytitle>legend</refentrytitle>
+      <manvolnum>1</manvolnum>
+    </citerefentry>
+  </refsect1>
+
+</refentry>
diff --git a/debian/mapserver-bin.manpages b/debian/mapserver-bin.manpages
index c0cf94d..5991fb9 100644
--- a/debian/mapserver-bin.manpages
+++ b/debian/mapserver-bin.manpages
@@ -1,3 +1,4 @@
 debian/man/legend.1
 debian/man/msencrypt.1
+debian/man/scalebar.1
 debian/man/shp2img.1

-- 
Mapserver