[SCM] mapnik branch, master, updated. debian/0.7.1-5-32-g8bfde74

2011-10-04 Thread David Paleino
The following commit has been merged in the master branch:
commit 2b1e25d9015d44662bd2869fdf31db19917cae77
Author: David Paleino da...@debian.org
Date:   Tue Oct 4 21:34:09 2011 +0200

Fix manpage

diff --git a/debian/manpages/mapnik-plugin-base.1 
b/debian/manpages/mapnik-plugin-base.1
index 865936a..937eaca 100644
--- a/debian/manpages/mapnik-plugin-base.1
+++ b/debian/manpages/mapnik-plugin-base.1
@@ -29,7 +29,7 @@ relevant to the version of Mapnik being targetted.
 .SH OPTIONS
 There are no options.
 .SH AUTHOR
-mapnik-plugin-path was written by Dominic Hargreaves.
+mapnik-plugin-base was written by Dominic Hargreaves.
 .PP
 This manual page was written by Dominic Hargreaves d...@earth.li,
 for the Debian project (but may be used by others).

-- 
C++/Python toolkit for developing GIS applications

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] mapnik branch, master, updated. debian/0.7.1-5-32-g8bfde74

2011-10-04 Thread David Paleino
The following commit has been merged in the master branch:
commit 8bfde746d5ddff20f32b874ae8df2d735c88311e
Author: David Paleino da...@debian.org
Date:   Tue Oct 4 22:14:25 2011 +0200

Added manpages

diff --git a/debian/libmapnik2-dev.manpages b/debian/libmapnik2-dev.manpages
index c9f4148..02cccb5 100644
--- a/debian/libmapnik2-dev.manpages
+++ b/debian/libmapnik2-dev.manpages
@@ -1 +1,2 @@
 debian/manpages/mapnik-plugin-base.1
+debian/manpages/mapnik-config.1
diff --git a/debian/manpages/mapnik-config.1 b/debian/manpages/mapnik-config.1
new file mode 100644
index 000..b50487e
--- /dev/null
+++ b/debian/manpages/mapnik-config.1
@@ -0,0 +1,53 @@
+.TH MAPNIK-CONFIG 1 October 4, 2011
+.SH NAME
+mapnik\-config \- return meta-information about Mapnik
+.SH SYNOPSIS
+.B mapnik\-config
+.R [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the \fBmapnik\-config\fR command.
+.PP
+\fBmapnik\-config\fP is a program that returns meta-information about the
+installed libmapnik.
+.SH OPTIONS
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+\fB\-\-prefix, \-\-prefix=\fInew_prefix\fR
+Display Mapnik prefix or, alternatively, temporarily set the Mapnik prefix to 
\fInew_prefix\fR.
+.TP
+.B \-\-libs
+Print library linking information.
+.TP
+.B \-\-dep\-libs
+Print library linking information for Mapnik depedencies.
+.TP
+.B \-\-ldflags
+Print library paths (\-L) information.
+.TP
+.B \-\-cflags
+Print pre-processor and compiler flags.
+.TP
+.B \-\-fonts
+Print default fonts directory.
+.TP
+.B \-\-input\-plugins
+Print default input plugins directory.
+.TP
+.B \-\-json
+Print all config options as JSON objects.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Shows version information.
+.TP
+.B \-\-svn\-revision
+Shows SVN revision information.
+.SH AUTHOR
+This manual page was written by David Paleino da...@debian.org, for the
+Debian project (but may be used by others), and is licensed under the
+terms of the GNU General Public License version 2 or, at your option,
+any later version.
diff --git a/debian/manpages/mapnik-speed-check.1 
b/debian/manpages/mapnik-speed-check.1
new file mode 100644
index 000..f3d522c
--- /dev/null
+++ b/debian/manpages/mapnik-speed-check.1
@@ -0,0 +1,18 @@
+.TH MAPNIK-SPEED-CHECK 1 October 4, 2011
+.SH NAME
+mapnik-speed-check \- program to check the speed of Mapnik rendering engine
+.SH SYNOPSIS
+.B mapnik\-speed\-check
+.I stylesheet
+.I iterations
+.R [minx,miny,maxx,maxy]
+.SH DESCRIPTION
+This manual page documents briefly the \fBmapnik\-speed\-check\fR command.
+.PP
+\fBmapnik\-speed\-check\fP is a program that can be used to test the Mapnik
+rendering engine, and its speed.
+.SH AUTHOR
+This manual page was written by David Paleino da...@debian.org, for the
+Debian project (but may be used by others), and is licensed under the
+terms of the GNU General Public License version 2 or, at your option,
+any later version.
diff --git a/debian/manpages/upgrade-map-xml.1 
b/debian/manpages/upgrade-map-xml.1
new file mode 100644
index 000..7363a29
--- /dev/null
+++ b/debian/manpages/upgrade-map-xml.1
@@ -0,0 +1,31 @@
+.TH UPGRADE-MAP-XML 1 October 4, 2011
+.SH NAME
+upgrade\-map\-xml \- program to convert stylesheets from Mapnik 0.* to the 
Mapnik 2.0 format
+.SH SYNOPSIS
+.B upgrade\-map\-xml
+.R [ options ]
+.I input-stylesheet
+.R [ output-stylesheet ]
+.SH DESCRIPTION
+This manual page documents briefly the \fBupgrade\-map\-xml\fR command.
+.PP
+\fBupgrade\-map\-xml\fP is a program to convert the old Mapnik 0.* format 
stylesheets
+to the new Mapnik2 format.
+.SH OPTIONS
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-\-indent
+Indent the resulting XML.
+.TP
+.B \-\-in\-place
+Update and overwrite the map in place.
+.SH AUTHOR
+This manual page was written by David Paleino da...@debian.org, for the
+Debian project (but may be used by others), and is licensed under the
+terms of the GNU General Public License version 2 or, at your option,
+any later version.
diff --git a/debian/mapnik-utils.manpages b/debian/mapnik-utils.manpages
index 95433a0..8a5a8fc 100644
--- a/debian/mapnik-utils.manpages
+++ b/debian/mapnik-utils.manpages
@@ -1 +1,3 @@
 debian/manpages/shapeindex.1
+debian/manpages/mapnik-speed-check.1
+debian/manpages/upgrade-map-xml.1

-- 
C++/Python toolkit for developing GIS applications

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] mapnik branch, master, updated. debian/0.7.1-5-32-g8bfde74

2011-10-04 Thread David Paleino
The following commit has been merged in the master branch:
commit d0760464829cbd1724c3cb5c9fb37afb69de2e7d
Author: David Paleino da...@debian.org
Date:   Tue Oct 4 21:30:40 2011 +0200

dversionmangle in debian/watch

diff --git a/debian/watch b/debian/watch
index 84c52d7..20d457f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+ds\d// \
 http://download.berlios.de/mapnik/mapnik-(\d+.*)\.tar\.gz

-- 
C++/Python toolkit for developing GIS applications

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel