[SCM] mapnik branch, master, updated. debian/0.7.1-5-25-g8743fac
The following commit has been merged in the master branch: commit 2a4e92c8570f8224ac99ee72dbb0a96b58ccc899 Author: David Paleino da...@debian.org Date: Tue Oct 4 13:55:03 2011 +0200 Remove commented lines diff --git a/debian/rules b/debian/rules index f701f98..1d23a82 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,6 @@ SCONS_FLAGS += PREFIX=/usr LIB_DIR_NAME=/mapnik/2.0 override_dh_auto_configure: scons $(SCONS_FLAGS) CCFLAGS=$(CFLAGS) configure -# dh_auto_configure override_dh_auto_build: set -e; \ @@ -24,8 +23,6 @@ override_dh_auto_build: scons $(SCONS_FLAGS) PYTHON=/usr/bin/$$py ; \ done -# dh_auto_build - override_dh_prep: dh_prep -Xdebian/tmp -- 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-25-g8743fac
The following commit has been merged in the master branch:
commit 0b6c85f92ed3e862841453725667f3f06c9250e1
Author: David Paleino da...@debian.org
Date: Tue Oct 4 11:47:28 2011 +0200
Additional binaries in mapnik-utils
diff --git a/debian/control b/debian/control
index 92b5337..68133d9 100644
--- a/debian/control
+++ b/debian/control
@@ -122,6 +122,8 @@ Architecture: any
Depends:
${shlibs:Depends}
, ${misc:Depends}
+ , python-mapnik2
+ , python-lxml
Description: C++/Python toolkit for developing GIS applications (utilities)
Mapnik is an OpenSource C++/Python toolkit for developing GIS
(Geographic Information Systems) applications. At the core is a C++
diff --git a/debian/mapnik-utils.install b/debian/mapnik-utils.install
index 24af807..cf5e446 100644
--- a/debian/mapnik-utils.install
+++ b/debian/mapnik-utils.install
@@ -1 +1,3 @@
usr/bin/shapeindex
+usr/bin/upgrade_map_xml.py
+usr/bin/mapnik-speed-check
diff --git a/debian/rules b/debian/rules
index a205d19..f7d3afe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,9 @@ override_dh_install:
dh_install
find $(CURDIR)/debian/ -name modserver.py | xargs chmod -x
+ mv $(CURDIR)/debian/mapnik-utils/usr/bin/upgrade_map_xml.py \
+ $(CURDIR)/debian/mapnik-utils/usr/bin/upgrade-map-xml
+
# build Python API documentation
# and trick epydoc into loading the shlib too
-ln -s ../_mapnik2.so bindings/python/mapnik/
--
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-25-g8743fac
The following commit has been merged in the master branch: commit a10e373326ff066f3e4dd52087de7c78264c2158 Author: David Paleino da...@debian.org Date: Tue Oct 4 11:39:12 2011 +0200 Install mapnik-config, and use it in mapnik-plugin-base diff --git a/debian/libmapnik2-dev.install b/debian/libmapnik2-dev.install index 8611b06..648e75c 100644 --- a/debian/libmapnik2-dev.install +++ b/debian/libmapnik2-dev.install @@ -1,3 +1,4 @@ usr/include/* usr/lib/*.so debian/mapnik-plugin-base usr/bin +usr/bin/mapnik-config diff --git a/debian/mapnik-plugin-base b/debian/mapnik-plugin-base index aac0327..7e95c8b 100755 --- a/debian/mapnik-plugin-base +++ b/debian/mapnik-plugin-base @@ -1,5 +1,5 @@ #!/bin/sh -SOVER=`readlink /usr/lib/libmapnik.so |sed -e 's/libmapnik.so.//'` +inputdir=$(mapnik-config --input-plugins) -echo /usr/lib/mapnik/$SOVER +echo $(dirname $inputdir/../) -- 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-27-g51a3f1b
The following commit has been merged in the master branch:
commit 51a3f1b91ca4f75f3bf24ee78bb4ec1befbd79ca
Author: David Paleino da...@debian.org
Date: Tue Oct 4 19:15:23 2011 +0200
Add ${python:Depends}
diff --git a/debian/control b/debian/control
index 7377d34..ad169b0 100644
--- a/debian/control
+++ b/debian/control
@@ -119,6 +119,7 @@ Architecture: any
Depends:
${shlibs:Depends}
, ${misc:Depends}
+ , ${python:Depends}
, python-mapnik2
, python-lxml
Description: C++/Python toolkit for developing GIS applications (utilities)
--
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-27-g51a3f1b
The following commit has been merged in the master branch: commit 57e6252cba4c6654ccbed4b744d6b98cfb5017f7 Author: David Paleino da...@debian.org Date: Tue Oct 4 19:08:12 2011 +0200 Purge debian/copyright from non-(anymore)-existing files diff --git a/debian/changelog b/debian/changelog index e77944d..abe37f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ mapnik (2.0.0+ds1-1) UNRELEASED; urgency=low * New input plugins compiled: geos, rasterlite * Package switch from pysupport to dh_python2 * Package renamed from libmapnik0.7 to libmapnik2-2.0 + * Purge debian/copyright from non-(anymore)-existing files - -- David Paleino da...@debian.org Tue, 27 Sep 2011 12:25:30 +0200 + -- David Paleino da...@debian.org Tue, 04 Oct 2011 19:07:56 +0200 mapnik (0.7.1-6) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index fcbd5de..56ea579 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,8 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ +Format: http://dep.debian.net/deps/dep5/ Files: debian/* Copyright: © 2006-2009, Dominic Hargreaves d...@earth.li - © 2010, David Paleino da...@debian.org + © 2010-2011, David Paleino da...@debian.org License: GPL-2+ Files: agg/* @@ -13,15 +13,6 @@ License: other This software is provided as is without express or implied warranty, and with no claim as to its suitability for any purpose. -Files: scons/* -Copyright: © 2001-2008, The SCons Foundation -License: MIT - -Files: fonts/dejavu-ttf-2.30/* -Copyright: © 2003, Bitstream, Inc. - © 2006, Tavmjong Bah tavmj...@free.fr -License: Bitstream, Arev - Files: fonts/unifont-5.1.20080907.ttf Copyright: © License: GPL-2 with exception @@ -32,10 +23,6 @@ License: GPL-2 with exception document to the terms of the GPL. X-Comment: see fonts/unifont_license.txt -Files: tinyxml/* -Copyright: © 2000-2006, Lee Thomason http://www.grinninglizard.com -License: TinyXML - Files: * Copyright: © 2006-2009, Artem Pavlenko © 2006-2009, Jean-Francois Doyon @@ -74,133 +61,3 @@ License: GPL-2+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. X-Comment: on Debian systems, the complete text of the GNU General Public License v2 can be found in `/usr/share/common-licenses/GPL-2'. - -License: MIT - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - Software), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - . - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY - KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -License: Bitstream - Permission is hereby granted, free of charge, to any person obtaining a copy - of the fonts accompanying this license (Fonts) and associated - documentation files (the Font Software), to reproduce and distribute the - Font Software, including without limitation the rights to use, copy, merge, - publish, distribute, and/or sell copies of the Font Software, and to permit - persons to whom the Font Software is furnished to do so, subject to the - following conditions: - . - The above copyright and trademark notices and this permission notice shall - be included in all copies of one or more of the Font Software typefaces. - . - The Font Software may be modified, altered, or added to, and in particular - the designs of glyphs or characters in the Fonts may be modified and - additional glyphs or characters may be added to the Fonts, only if the fonts - are renamed to names not containing either the words Bitstream or the word - Vera. - . - This License becomes null and void to the extent applicable to Fonts or Font - Software that has been modified and is distributed under the Bitstream - Vera names. - . - The Font Software may be sold as part of a larger software package but no - copy of one or more of the Font Software typefaces may be sold by itself. - . - THE FONT SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, - TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME - FOUNDATION BE LIABLE FOR ANY
[SCM] mapnik branch, master, updated. debian/0.7.1-5-28-gd49a6ed
The following commit has been merged in the master branch: commit d49a6ed158e71edc577de90b91f4a7b779900d6b Author: David Paleino da...@debian.org Date: Tue Oct 4 19:16:33 2011 +0200 Fix python-mapnik naming diff --git a/debian/python-mapnik.install b/debian/python-mapnik.install deleted file mode 100644 index 73c8a70..000 --- a/debian/python-mapnik.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python*/*-packages/mapnik/* -usr/lib/python*/*-packages/mapnik/*/* diff --git a/debian/python-mapnik.examples b/debian/python-mapnik2.examples similarity index 100% rename from debian/python-mapnik.examples rename to debian/python-mapnik2.examples diff --git a/debian/python-mapnik2.install b/debian/python-mapnik2.install new file mode 100644 index 000..bf1ee29 --- /dev/null +++ b/debian/python-mapnik2.install @@ -0,0 +1,2 @@ +usr/lib/python*/*-packages/mapnik2/* +usr/lib/python*/*-packages/mapnik2/*/* -- 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-29-g8d2ea78
The following commit has been merged in the master branch: commit 8d2ea7811ca7297c041049c1a4ade5243710138a Author: David Paleino da...@debian.org Date: Tue Oct 4 19:20:15 2011 +0200 Make lintian happy about DEP5 diff --git a/debian/copyright b/debian/copyright index 56ea579..960ae42 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 Files: debian/* Copyright: © 2006-2009, Dominic Hargreaves d...@earth.li -- 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
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
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
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
