date:20130911

libterralib_4.0.0-5_i386.changes ACCEPTED into unstable

2013-09-11 Thread Debian FTP Masters



Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Wed, 11 Sep 2013 17:07:38 +0100
Source: libterralib
Binary: libterralib-dev libterralib libterralib-doc
Architecture: source i386 all
Version: 4.0.0-5
Distribution: unstable
Urgency: low
Maintainer: Debian GIS Team 
Changed-By: Alastair McKinstry 
Description: 
 libterralib - C++ library for Geographical Information Systems
 libterralib-dev - C++ library for Geographical Information Systems -- 
development p
 libterralib-doc - C++ library for Geographical Information Systems -- 
documentation
Changes: 
 libterralib (4.0.0-5) unstable; urgency=low
 .
   * B-D on libtiff-dev for transition.
   * Standards-Version: 3.9.4; no changes required.
   * Debhelper >  9 Dependency now.
   * Remove B-D on python; not used.
Checksums-Sha1: 
 cb52e656ac02d67cf72d3afbf464ef34bee0e68f 2108 libterralib_4.0.0-5.dsc
 95d380902bcb80a39d2dc11c3a15fe43bf512835 4930 libterralib_4.0.0-5.debian.tar.gz
 8c2d5fdbf09af23f5c545f32212ab9c0d6772e4b 1894426 
libterralib-dev_4.0.0-5_i386.deb
 a34bdb85d1de50a1c97655b9b383d91d5ea5 1254578 libterralib_4.0.0-5_i386.deb
 c79afe3a7510022fde3a73422d7b7d40707ede4a 20382434 
libterralib-doc_4.0.0-5_all.deb
Checksums-Sha256: 
 69b52204192b7312d6454da3740bd6e194fa089609a5ccf7620f76667ccfb078 2108 
libterralib_4.0.0-5.dsc
 3b4c121d78c2393740a944aca1f21dab8c1bc4c98a9e137dbf427556d5d2d165 4930 
libterralib_4.0.0-5.debian.tar.gz
 14afcb59bb9a26b667611b9faa1961391e00464f5f45f2e2aef745c519052a57 1894426 
libterralib-dev_4.0.0-5_i386.deb
 95e30e39c7327b028fe5ed38e46dfb11f76e2a60f5ff9fd27be8f29329aea5d5 1254578 
libterralib_4.0.0-5_i386.deb
 3a9067c82e929fd9350d86d2f7c640d9ef3c4dea6e3a60bafaafb04dc47bc725 20382434 
libterralib-doc_4.0.0-5_all.deb
Files: 
 84ad01778d8e16fbb30676a3ec89af10 2108 libs optional libterralib_4.0.0-5.dsc
 36d2467dcd79d972cb7b958148705ac0 4930 libs optional 
libterralib_4.0.0-5.debian.tar.gz
 de5ae4287037ca2652dced7281a99918 1894426 libdevel optional 
libterralib-dev_4.0.0-5_i386.deb
 29ca7111934d1df6b40a3c4c4acba44a 1254578 libs optional 
libterralib_4.0.0-5_i386.deb
 f513591c830fbcaf24717bec5a916602 20382434 doc optional 
libterralib-doc_4.0.0-5_all.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAEBCAAGBQJSMJ3nAAoJEN9LdrZRJ3Qs9PgP/irwlkomC38lKtYDQpzARG0D
SVGAu3xYnOMBhl/NIUSuDf8nZUQyaUVKmsc9Atlg2LNRCqrSN//LjiCIenI85hrh
3roL1lihnmJThWJR5pS5RjOR2MSqB5QHZIwv+uyx7ENW4ajTVKn5GbHy4SKEaQFn
+5w5T1fKq5sxlcrb/s5MO16X7AjKzUmdsRu27C3zasqjz+ctujwkcIQjqnL+p4XF
MoJDyCXCkGU2um6Hj0RYCparWgcosmLTkGhKjL8QADVjtza7jB+lCUZ/0Pfkj9LU
Hnyt9WoTeSFkbJL86W8W4eQABXzUxTCnuZHKcOthBtHvsIRs1pMMoEWSlOUytzSG
5qaPa7Bmc0bv+7bm+qL6vyVqW8fS7p0Pkct/EZqwY5FLUA2JVRl5pUpaTyWlorCq
tIu17UhJKhA9w0TPUdW3cwhUGNbI315cOLlV4Yx1cvflC9xiAg63UfUZdQQQXfd5
czhgaGdjHMXP1dEhO5fhhNlvSaJVF/P0WrQS20htFC260/Cj7YWmVf/bV5pnKP31
8mdwcWoPXxY6SPL/k1sp/EYzE0mbCL+8GEXqxtzW79sg1S9WQ9UoOQRofl8Do9Tu
tVjr6vQw+8aIg2mtdh26FAsGdeXzArUpuD6W7gwFiAyYEIoUxitNl4NQzGtCg+yT
TV61De9DyelNfTu8HJ8d
=oMiO
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

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

Processing of libterralib_4.0.0-5_i386.changes

2013-09-11 Thread Debian FTP Masters

libterralib_4.0.0-5_i386.changes uploaded successfully to localhost
along with the files:
  libterralib_4.0.0-5.dsc
  libterralib_4.0.0-5.debian.tar.gz
  libterralib-dev_4.0.0-5_i386.deb
  libterralib_4.0.0-5_i386.deb
  libterralib-doc_4.0.0-5_all.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

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

Bug#721805: [bug-report] hdf5 misbehaves when compiled with gcc 4.8.0

2013-09-11 Thread Andrea Bedini

This is what I came up with:

1) one can check if the bug is present in a compiled library by running the
following test

#include 

int main() {
  return !(H5Tget_order(H5T_NATIVE_DOUBLE) ==
H5Tget_order(H5T_NATIVE_LDOUBLE));
}

$ ./test_broken || echo fail
fail

2) a simple but temporary fix is to change the following line of
src/Makefile.am

H5detect_CFLAGS = -O0 $(AM_CFLAGS)

I hope this will help. I have no idea what the developers want to do.

Thanks,
Andrea



On 4 September 2013 15:30, Sylvestre Ledru  wrote:

> Hello,
>
>
> On 04/09/2013 02:51, Andrea Bedini wrote:
> > Hi,
> >
> > it's too hard to figure out how to send a proper bug report :) I'll
> > just write an email.
> >
> > It seems that on some architectures hdf5 has issues when compiled with
> > gcc 4.8.0 and newer compilers.
> >
> Ouch. Thanks for investigating it. Let me know when you have a patch we
> can apply.
>
> Thanks,
> Sylvestre
>
>


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

libgeotiff-dfsg_1.3.0+dfsg-3.2_i386.changes ACCEPTED into unstable

2013-09-11 Thread Debian FTP Masters



Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Tue, 10 Sep 2013 08:31:31 +0100
Source: libgeotiff-dfsg
Binary: libgeotiff-dev libgeotiff2 geotiff-bin
Architecture: source i386
Version: 1.3.0+dfsg-3.2
Distribution: unstable
Urgency: low
Maintainer: Debian GIS Project 
Changed-By: Alastair McKinstry 
Description: 
 geotiff-bin - the GeoTIFF library -- tools
 libgeotiff-dev - the GeoTIFF library -- development files
 libgeotiff2 - the GeoTIFF library -- run-time files
Changes: 
 libgeotiff-dfsg (1.3.0+dfsg-3.2) unstable; urgency=low
 .
   * Non-maintainer upload.
   * Change B-D from libtiff5-alt-dev to libtiff-dev for libtiff5 transition.
Checksums-Sha1: 
 5e733124bdf5f0e76c7a4e938b801de3301efc92 2221 
libgeotiff-dfsg_1.3.0+dfsg-3.2.dsc
 0331df488d7f5e63aa1b982748afdc6020c2f6a8 6824 
libgeotiff-dfsg_1.3.0+dfsg-3.2.debian.tar.gz
 b5e63a23e14f349838fe0458aed7a7d532f855f4 84536 
libgeotiff-dev_1.3.0+dfsg-3.2_i386.deb
 315d656241b893f06eb6cb05fb907c802efecedf 57310 
libgeotiff2_1.3.0+dfsg-3.2_i386.deb
 f581e66962321891410fe4570ceb4f46ed545dea 40054 
geotiff-bin_1.3.0+dfsg-3.2_i386.deb
Checksums-Sha256: 
 125db3d57b04fe1caa00256b3ba2d89f77d8b7431c0c3f3a47ac8956e377a158 2221 
libgeotiff-dfsg_1.3.0+dfsg-3.2.dsc
 6b49c36444b2d060e7e37897993056584c376238db572399652ee22a8c225228 6824 
libgeotiff-dfsg_1.3.0+dfsg-3.2.debian.tar.gz
 a4f272933db5fb1c6b5e552d9ac236bc45b4f76a90469b76342528fa7cabb35f 84536 
libgeotiff-dev_1.3.0+dfsg-3.2_i386.deb
 0d12454725fb53b79fd26b9b85c93f305e1be036ea9b9688858ff9069d66d608 57310 
libgeotiff2_1.3.0+dfsg-3.2_i386.deb
 0f10a980e2bb130866ad3ce6e518a058aa5c472fe940479f4c0eea9a84ae00f8 40054 
geotiff-bin_1.3.0+dfsg-3.2_i386.deb
Files: 
 84b7fa51a7e521906e79575840efb94b 2221 science extra 
libgeotiff-dfsg_1.3.0+dfsg-3.2.dsc
 64b09bac9874d3a92c4c259dbb1fc9f1 6824 science extra 
libgeotiff-dfsg_1.3.0+dfsg-3.2.debian.tar.gz
 676adc726408cc41b521dcc77db8de29 84536 libdevel extra 
libgeotiff-dev_1.3.0+dfsg-3.2_i386.deb
 d9a17007bcc24b07ccc91982bf10012a 57310 libs extra 
libgeotiff2_1.3.0+dfsg-3.2_i386.deb
 5bcff66b4105944bf9b64b01150f0b12 40054 science extra 
geotiff-bin_1.3.0+dfsg-3.2_i386.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAEBCAAGBQJSMGzoAAoJEN9LdrZRJ3QsY5EP/3i6VRxIt+EFgSDRCZrSe/1e
uKcLPc3c7Xm640BB6KrbvNMHH8V0CibwO9s7MdCyg2BHGz6FppltxnQql8u6pnCw
ISQB1aH9pEs2RFZ4K57KU4/pnW3eO1LhrQyue7JVrpwEAluucd5Uy3zl585N5Njz
fsb/te4O++JSbuC65XWW/sUCDEFVRTB5+gzuZ+qte/OtrfYPIjJqxLGe5KJOWntp
vSHbz/8YXp3eLbWPGdoawU/gJ6kIF6L0IbyASXY8QxCV4PgH+3P077/O/vm8yW4p
rv5oqsTY54oEAm25ozqEz/P9Ba0TPxbmZnqfKtz4WinZU7OslbQZ9lwHynFs/NH2
Oe8uj+Bb0EgUwQmk3TrZ5apZLNDV2nvnKd+Sp9mXQtC0RI+FEkTIDswacERCHTqv
k/cmI12foxFSN1SYGBPIL7KR7frEBFSzRimWHmrWCfVVUzwsu5Hk7m42RqCWwCre
5ffZ3tzFnjlPmjvjII67ypsBG93a/Zy6ccNcge8a93sGp+7q2CL2a/5+ynfeEne7
qY76NSwPpW1R4GMtx4UtDGWXHMb+/vykXrN/Ym7ReN74ureVJfZ9XfHjiURxpA9a
3IsZQLiyuYeVlgQlNIIhVLVYx3PqY/cQv99scTRnD4FTA6SHCk6FDY/NXXnZB2pp
qFERsURrXoBNoTISWyPK
=51R/
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

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

Processing of libgeotiff-dfsg_1.3.0+dfsg-3.2_i386.changes

2013-09-11 Thread Debian FTP Masters

libgeotiff-dfsg_1.3.0+dfsg-3.2_i386.changes uploaded successfully to localhost
along with the files:
  libgeotiff-dfsg_1.3.0+dfsg-3.2.dsc
  libgeotiff-dfsg_1.3.0+dfsg-3.2.debian.tar.gz
  libgeotiff-dev_1.3.0+dfsg-3.2_i386.deb
  libgeotiff2_1.3.0+dfsg-3.2_i386.deb
  geotiff-bin_1.3.0+dfsg-3.2_i386.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

___
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] mapserver tag, upstream/6.4.0_beta1, created. upstream/6.2.1-1-g967f9ca

2013-09-11 Thread Bas Couwenberg

The tag, upstream/6.4.0_beta1 has been created
at  967f9ca46ce9be8841044c9dfc4486509036b47c (commit)

- Shortlog 
commit 967f9ca46ce9be8841044c9dfc4486509036b47c
Author: Bas Couwenberg 
Date:   Wed Sep 11 14:43:58 2013 +0200

Imported Upstream version 6.4.0-beta1
---

-- 
Packaging for MapServer

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

postgis_2.1.0-2_amd64.changes ACCEPTED into unstable, unstable

2013-09-11 Thread Debian FTP Masters



Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Tue, 10 Sep 2013 21:53:57 +0200
Source: postgis
Binary: postgis postgis-doc libpostgis-java liblwgeom-2.1.0 liblwgeom-dev 
postgresql-9.3-postgis-2.1 postgresql-9.3-postgis-2.1-scripts
Architecture: source amd64 all
Version: 2.1.0-2
Distribution: unstable
Urgency: low
Maintainer: Debian GIS Project 
Changed-By: Markus Wanner 
Description: 
 liblwgeom-2.1.0 - PostGIS "Lightweight Geometry" library
 liblwgeom-dev - PostGIS "Lightweight Geometry" library - Development files
 libpostgis-java - Geographic objects support for PostgreSQL -- JDBC support
 postgis- Geographic objects support for PostgreSQL
 postgis-doc - Geographic objects support for PostgreSQL -- documentation
 postgresql-9.3-postgis-2.1 - Geographic objects support for PostgreSQL 9.3
 postgresql-9.3-postgis-2.1-scripts - Geographic objects support for PostgreSQL 
9.3 -- scripts
Changes: 
 postgis (2.1.0-2) unstable; urgency=low
 .
   * Correct generation of debian/control: drop an unnecessary grep in
 debian/pgversions. I broke it when changing to '9.0+'.
   * Copy binaries for the common binary package 'postgis' from the newest
 version, rather than hardcoding 9.1.
   * Add experimental patch from upstream to increase pass rate on
 non-Intel architectures (upstream-r11934).
   * Add a description and some tags to patch fix-manpage.
Checksums-Sha1: 
 44beaf7c53f2dc65f88a65b43581203781646917 2369 postgis_2.1.0-2.dsc
 524cbb3ef1036a824c395ffbebd95ff15b308e32 32654 postgis_2.1.0-2.debian.tar.gz
 63a7f6a52c43c4d0cd19548acb4f25a3eec1d9a1 238188 postgis_2.1.0-2_amd64.deb
 032c41820f8713daf0ebd68e9baa2e9485db3302 233604 
liblwgeom-2.1.0_2.1.0-2_amd64.deb
 ac5a6f597bfed7d479254ec5e2e52e66c7416257 256044 liblwgeom-dev_2.1.0-2_amd64.deb
 20e7090f66728cd51f6b15b217cbdcd78cf946db 321666 
postgresql-9.3-postgis-2.1_2.1.0-2_amd64.deb
 610db2561f6b6445dd8a64622f591a6bd2d41fda 368802 postgis-doc_2.1.0-2_all.deb
 de2cd9b0bb86a05dd8eecbb9ad952479e90b929b 161332 libpostgis-java_2.1.0-2_all.deb
 51d65e8fc5a90ec0bf2e08f9f1ac3e24f2f33549 439610 
postgresql-9.3-postgis-2.1-scripts_2.1.0-2_all.deb
Checksums-Sha256: 
 9e0fb0512a2a6ff11cd93fdaab86f9e16a2938064b21f059d5abc364e623c675 2369 
postgis_2.1.0-2.dsc
 9be55de20d10691bd8c4fe5d803596a02ec1e0eddb4eb77f6378df4c462e630c 32654 
postgis_2.1.0-2.debian.tar.gz
 811d32a6fd163ff02d4e470d9089e287a0141073e8147f2f1280e76ca3b42210 238188 
postgis_2.1.0-2_amd64.deb
 8cb8574cb92870678fbe0ca06179a99c6e1d09e0b750246799e94e5e77697968 233604 
liblwgeom-2.1.0_2.1.0-2_amd64.deb
 fcc37badc99244c639e096d0725a7bac8bba9f733826e3f06f375b92b5d71e99 256044 
liblwgeom-dev_2.1.0-2_amd64.deb
 731de044f91099ec995848d092cf8d564649fbdce6a439efe46b8fe1f91a7b66 321666 
postgresql-9.3-postgis-2.1_2.1.0-2_amd64.deb
 8a556551127b8b45aeab42e8ff2790c52ba882a01237549fe68f26d402adda96 368802 
postgis-doc_2.1.0-2_all.deb
 3acc1a45f7c3dedaadb5aebf220e98fd6619babe3246a7cfedac35b44f61e785 161332 
libpostgis-java_2.1.0-2_all.deb
 f6af2d2fae0bc6ff6a0554109c81dd06634cf3e624188d1fb5a79d69c341 439610 
postgresql-9.3-postgis-2.1-scripts_2.1.0-2_all.deb
Files: 
 dd8b9745235c6cce2280a25576ed1049 2369 misc optional postgis_2.1.0-2.dsc
 095dde45c488030d4c937ec2c460de32 32654 misc optional 
postgis_2.1.0-2.debian.tar.gz
 1682b73d410c5d8f00bd3dd5ed3bd314 238188 misc optional postgis_2.1.0-2_amd64.deb
 8e397832011d21ddf980612318a61c12 233604 libs optional 
liblwgeom-2.1.0_2.1.0-2_amd64.deb
 bd390563efe4eda0ed880f19acfba038 256044 libdevel optional 
liblwgeom-dev_2.1.0-2_amd64.deb
 98e5c06b5c6e39df35c4ae9d579db0cf 321666 misc optional 
postgresql-9.3-postgis-2.1_2.1.0-2_amd64.deb
 6e052b410ee73f4c507863b039da5375 368802 doc optional 
postgis-doc_2.1.0-2_all.deb
 691f8595dfff182586459fbb3f8d5129 161332 java optional 
libpostgis-java_2.1.0-2_all.deb
 8fce357e47f51979ec28d5b8e905842c 439610 misc optional 
postgresql-9.3-postgis-2.1-scripts_2.1.0-2_all.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iF4EAREIAAYFAlIwcPEACgkQ3VcITofi8rvcuwD/VR6bgEFO705p6Ml3n2ZqUfLD
HhtXUwL7LOCSGo5Si10BAKASk4EhnhfTPKKvcpGtCFcosuEz3IJrZOnVDaPEnbl6
=Ly4d
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit e12da9e53c8339c5290eb1f553bd4b193b3b4a8d
Author: Bas Couwenberg 
Date:   Sat Sep 7 21:50:20 2013 +0200

Update patch header, applied upstream.

diff --git a/debian/patches/install-threads.patch 
b/debian/patches/install-threads.patch
index ce4832a..5d476f1 100644
--- a/debian/patches/install-threads.patch
+++ b/debian/patches/install-threads.patch
@@ -1,5 +1,7 @@
 Description: Rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE too.
 Author: Bas Couwenberg 
+Bug: https://github.com/mapserver/mapserver/pull/4750
+Applied-Upstream: 6.4.0, 
https://github.com/mapserver/mapserver/commit/458d224e46c1b26ab2400ff766d4df359cc8e703
 Last-Update: 2013-09-07
 --- a/INSTALL.CMAKE
 +++ b/INSTALL.CMAKE

-- 
Packaging for MapServer

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 3c466e668cc56deb6edfae9abe40f7c384d21f75
Author: Bas Couwenberg 
Date:   Sun Sep 1 17:43:58 2013 +0200

Update hardening.patch for CMake build.

diff --git a/debian/changelog b/debian/changelog
index d97530e..9b39ab0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
   * New upstream release: 6.4.0-beta2.
   * Build system changed from autotools to cmake.
   * Update Build-Depends to include: libgif-dev, librsvg2-dev, pkg-config.
+  * Update hardening.patch for CMake build.
 
  -- Bas Couwenberg   Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index accb53d..480bfab 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -1,103 +1,29 @@
 Description: Add support for hardening build flags.
 Author: Bas Couwenberg 
-Last-Update: 2013-06-30
 a/Makefile.in
-+++ b/Makefile.in
-@@ -254,6 +254,11 @@ FLAGS = @DEBUG_FLAGS@ $(DEFINES) $(INCLU
- 
- CFLAGS   = @CFLAGS@ $(FLAGS)
- CXXFLAGS = @CXXFLAGS@ $(FLAGS)
-+LDFLAGS = @LDFLAGS@
+Last-Update: 2013-09-02
+--- a/mapscript/ruby/CMakeLists.txt
 b/mapscript/ruby/CMakeLists.txt
+@@ -7,6 +7,23 @@ include_directories(${PROJECT_SOURCE_DIR
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/ruby)
+ SWIG_ADD_MODULE(rubymapscript ruby ../mapscript.i)
+ 
++# Ruby mapscript fails to build with -Werror=format-security
 +
-+HARDENING_FLAGS = @CFLAGS@ @LDFLAGS@
++if(${CMAKE_C_FLAGS} MATCHES "-Werror=format-security")
++  string(REPLACE "-Werror=format-security" "" TMP "${CMAKE_C_FLAGS}")
++  set(CMAKE_C_FLAGS "${TMP}")
++endif(${CMAKE_C_FLAGS} MATCHES "-Werror=format-security")
 +
-+LINK+=$(LDFLAGS)
- 
- # Link flags and shared libs only
- SUP_LIBS =  $(FT_LIB) $(GD_LIB) $(OGL_LIB) $(FTGL_LIB) $(PROJ_LIBS) \
-@@ -417,6 +422,7 @@ mapscriptvars: Makefile
-   echo $(LIBMAP) >> mapscriptvars
-   echo -Wl,$(EXE_LDFLAGS) >> mapscriptvars
-   grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
-+  echo $(HARDENING_FLAGS) >> mapscriptvars
- 
- mapserver-config: Makefile
-   rm -f mapserver-config
 a/mapscript/perl/Makefile.PL.in
-+++ b/mapscript/perl/Makefile.PL.in
-@@ -1,5 +1,6 @@
- # File : Makefile.PL
- use ExtUtils::MakeMaker;
-+use Config;
- 
- open(STREAM, '../../mapscriptvars') or die('Unable to open mapscriptvars, 
have you built the MapServer yet?'); 
- 
-@@ -33,10 +34,14 @@ if ($ms_version_line) {
- # Default is 4.3
- else { $ms_version = '4.3'; }
- 
-+$hardening_flags = ;
-+chomp $hardening_flags;
++if(${CMAKE_CXX_FLAGS} MATCHES "-Werror=format-security")
++  string(REPLACE "-Werror=format-security" "" TMP "${CMAKE_CXX_FLAGS}")
++  set(CMAKE_CXX_FLAGS "${TMP}")
++endif(${CMAKE_CXX_FLAGS} MATCHES "-Werror=format-security")
 +
- print $inc."\n";
- print $libs."\n";
- print $static_libs."\n";
- print $ms_version."\n";
-+print $hardening_flags."\n";
- 
- my $swigInterfaceFile = "../mapscript.i";
- my $swigWrapperFile   = "mapscript_wrap.c";
-@@ -75,6 +80,8 @@ WriteMakefile(
- 'DEFINE'  => $define,
- 'INC' => $inc,
- 'LIBS'=> [$libs,$static_libs],
-+'OPTIMIZE'=> $hardening_flags,
-+'LD'  => "$Config{ld} $hardening_flags",
- 'OBJECT'  => 'mapscript_wrap.o',
- 'VERSION' => $ms_version
- );
 a/mapscript/php/Makefile.in
-+++ b/mapscript/php/Makefile.in
-@@ -58,6 +58,7 @@ XTRALIBS= @XTRALIBS@
- RUNPATHS= -rpath $(libdir)
- 
- CFLAGS = @CFLAGS@ @USE_PHP_REGEX@ -DCOMPILE_DL=1 @PHP_VERSION_FLAG@
-+LDFLAGS=@LDFLAGS@
- 
- 
- PHP_INC = `$(PHPCONFIG) --includes ` @APACHE_INC@
-@@ -88,7 +89,7 @@ PHP_EXT_DIR=`$(PHPCONFIG) --extension-di
- 
- LT_LDFLAGS=-rpath $(PHP_EXT_DIR) -module
- OBJ_SUFFIX=lo
--LINK=$(LTLD) $(LD) $(LT_LDFLAGS)
-+LINK=$(LTLD) $(LD) $(LDFLAGS) $(LT_LDFLAGS)
- MS_LIBS =   ../../libmapserver.la
- 
- MS_VERSION = @MS_VERSION@
 a/mapscript/python/Makefile.in
-+++ b/mapscript/python/Makefile.in
-@@ -29,10 +29,11 @@ PYINCDIR=`$(PYTHON) -c "from distutils.s
- RUNPATH= -rpath $(PYLIBDIR)
- DEFINES=@ALL_ENABLED@
- CFLAGS = $(DEFINES) @CFLAGS@ -I$(PYINCDIR) @MS_INC@ @ALL_INC@
-+LDFLAGS=@LDFLAGS@
- 
- LT_LDFLAGS= $(RUNPATH) -module
- OBJ_SUFFIX=lo
--LINK=$(LTLD) $(LD) $(LT_LDFLAGS)
-+LINK=$(LTLD) $(LD) $(LDFLAGS) $(LT_LDFLAGS)
- MS_LIB =   $(top_builddir)/libmapserver.la
- 
- 
 a/mapscript/ruby/extconf.rb
-+++ b/mapscript/ruby/extconf.rb
-@@ -14,7 +14,7 @@ MAPSERVER_LOCAL_LIBS=Pathname.new(File.d
++if(${CMAKE_CPP_FLAGS} MATCHES "-Werror=format-security")
++  string(REPLACE "-Werror=format-security" "" TMP "${CMAKE_CPP_FLAGS}")
++  set(CMAKE_CPP_FLAGS "${TMP}")
++endif(${CMAKE_CPP_FLAGS} MATCHES "-Werror=format-security")
++
+ SWIG_LINK_LIBRARIES(rubymapscript ${RUBY_LIBRARY} ${MAPSERVER_LIBMAPSERVER})
  
- # $CFLAGS works only with 1.8 ??? -> the -

[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 743096794bfa468331022d47beb1a8ec492f2262
Author: Bas Couwenberg 
Date:   Sun Sep 1 17:38:50 2013 +0200

Drop obsolete patch: shp2img-typo.patch.

diff --git a/debian/changelog b/debian/changelog
index 5737efe..5bec8c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
 - fixmapscriptvars.patch (mapscriptvars no longer used)
 - php_segfault.patch (applied upstream)
 - mapows-contenttype.patch (applied upstream)
+- shp2img-typo.patch (applied upstream)
 
  -- Bas Couwenberg   Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index f7d70be..49df62d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 hardening.patch
-shp2img-typo.patch
 ruby-shebang.patch
diff --git a/debian/patches/shp2img-typo.patch 
b/debian/patches/shp2img-typo.patch
deleted file mode 100644
index 502d2a8..000
--- a/debian/patches/shp2img-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix typo in usage information.
-Author: Bas Couwenberg 
-Bug: https://github.com/mapserver/mapserver/pull/4740
-Applied-Upstream: 
https://github.com/mapserver/mapserver/commit/cbc9683b3a3fd07059312583aaa10b267907e711
-Last-Update: 2013-06-14
 a/shp2img.c
-+++ b/shp2img.c
-@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
-   fprintf(stdout,"  -o image: output filename (stdout if not 
provided)\n");
-   fprintf(stdout,"  -e minx miny maxx maxy: extents to render\n");
-   fprintf(stdout,"  -s sizex sizey: output image size\n");
--  fprintf(stdout,"  -l layers: layers / groups to enable - make sure they 
are quoted and space seperated if more than one listed\n" );
-+  fprintf(stdout,"  -l layers: layers / groups to enable - make sure they 
are quoted and space separated if more than one listed\n" );
-   fprintf(stdout,"  -all_debug n: Set debug level for map and all 
layers\n" );
-   fprintf(stdout,"  -map_debug n: Set map debug level\n" );
-   fprintf(stdout,"  -layer_debug layer_name n: Set layer debug level\n" );

-- 
Packaging for MapServer

___
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] mapserver annotated tag, upstream/6.4.0_rc1, updated. upstream/6.4.0_rc1

2013-09-11 Thread Bas Couwenberg

The annotated tag, upstream/6.4.0_rc1 has been updated
to  61369b40b95d198f2983035f8c850f9fe6d1309a (tag)
  from  d3dd19a5194edf20555c2f7b0be57a3942341189 (which is now obsolete)
   tagging  d3dd19a5194edf20555c2f7b0be57a3942341189 (commit)
  replaces  upstream/6.4.0_beta2
 tagged by  Bas Couwenberg
on  Wed Sep 11 18:03:39 2013 +0200

- Shortlog 
Upstream version 6.4.0-rc1

Bas Couwenberg (1):
  Imported Upstream version 6.4.0-rc1

---

-- 
Packaging for MapServer

___
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] mapcache branch, jessie, updated. upstream/1.0.0-50-g30debef

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the jessie branch:
commit 30debef770a123ca35746a2a6f56359426b67d24
Author: Bas Couwenberg 
Date:   Tue Jul 23 20:01:24 2013 +0200

Use www in Homepage URL.

diff --git a/debian/control b/debian/control
index c8eaced..61477ab 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), 
autotools-dev,
  autoconf, dh-autoreconf, chrpath,
  docbook2x, docbook-xsl, docbook-xml, xsltproc
 Standards-Version: 3.9.4
-Homepage: http://mapserver.org/en/mapcache/
+Homepage: http://www.mapserver.org/en/mapcache/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapcache.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/mapcache.git
 

-- 
Packaging for MapCache

___
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] mapserver annotated tag, upstream/6.4.0_beta1, updated. upstream/6.4.0_beta1

2013-09-11 Thread Bas Couwenberg

The annotated tag, upstream/6.4.0_beta1 has been updated
to  13471f5a5a2656883bf955e3eac1b86484ff60a3 (tag)
  from  967f9ca46ce9be8841044c9dfc4486509036b47c (which is now obsolete)
   tagging  967f9ca46ce9be8841044c9dfc4486509036b47c (commit)
  replaces  upstream/6.2.1
 tagged by  Bas Couwenberg
on  Wed Sep 11 18:03:28 2013 +0200

- Shortlog 
Upstream version 6.4.0-beta1

Bas Couwenberg (1):
  Imported Upstream version 6.4.0-beta1

---

-- 
Packaging for MapServer

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 5221eec665c76fe3f3972fdc2db441adb1284eef
Author: Bas Couwenberg 
Date:   Sat Sep 7 21:24:14 2013 +0200

Add patch to rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE.

diff --git a/debian/changelog b/debian/changelog
index 62ce886..c6f0585 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
   * New upstream release: 6.4.0-rc1.
   * Rename WITH_THREADS to WITH_THREAD_SAFETY.
   * Drop patch install-ruby-mapscript.patch, applied upstream.
+  * Add patch to rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE.
 
  -- Bas Couwenberg   Sat, 07 Sep 2013 20:56:16 +0200
 
diff --git a/debian/patches/install-threads.patch 
b/debian/patches/install-threads.patch
new file mode 100644
index 000..ce4832a
--- /dev/null
+++ b/debian/patches/install-threads.patch
@@ -0,0 +1,14 @@
+Description: Rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE too.
+Author: Bas Couwenberg 
+Last-Update: 2013-09-07
+--- a/INSTALL.CMAKE
 b/INSTALL.CMAKE
+@@ -140,7 +140,7 @@ of these can be enabled or disabled by p
+  - option(WITH_WFS "Enable WFS Server support (requires PROJ and OGR 
support)" ON)
+  - option(WITH_WCS "Enable WCS Server support (requires PROJ and GDAL 
support)" ON)
+  - option(WITH_LIBXML2 "Choose if libxml2 support should be built in (used 
for sos, wcs 1.1,2.0 and wfs 1.1)" ON)
+- - option(WITH_THREADS "Choose if a thread-safe version of libmapserver 
should be built (only recommended for some mapscripts)" OFF)
++ - option(WITH_THREAD_SAFETY "Choose if a thread-safe version of libmapserver 
should be built (only recommended for some mapscripts)" OFF)
+  - option(WITH_GIF "Enable GIF support (for PIXMAP loading)" ON)
+  - option(WITH_PYTHON "Enable Python mapscript support" OFF)
+  - option(WITH_PHP "Enable Python mapscript support" OFF)
diff --git a/debian/patches/series b/debian/patches/series
index d157b06..b1b1b94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 hardening.patch
 ruby-shebang.patch
 perl-mapscript-install.patch
+install-threads.patch

-- 
Packaging for MapServer

___
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] mapserver tag, upstream/6.4.0_rc1, created. upstream/6.2.1-3-gd3dd19a

2013-09-11 Thread Bas Couwenberg

The tag, upstream/6.4.0_rc1 has been created
at  d3dd19a5194edf20555c2f7b0be57a3942341189 (commit)

- Shortlog 
commit d3dd19a5194edf20555c2f7b0be57a3942341189
Author: Bas Couwenberg 
Date:   Wed Sep 11 15:14:37 2013 +0200

Imported Upstream version 6.4.0-rc1
---

-- 
Packaging for MapServer

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit e7f2bd8acb311c1d586858218d5865f8a81e5134
Author: Bas Couwenberg 
Date:   Sat Sep 7 21:09:45 2013 +0200

Rename WITH_THREADS to WITH_THREAD_SAFETY.

diff --git a/debian/changelog b/debian/changelog
index d0d5e2e..76315c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
+
+  * New upstream release: 6.4.0-rc1.
+  * Rename WITH_THREADS to WITH_THREAD_SAFETY.
+
+ -- Bas Couwenberg   Sat, 07 Sep 2013 20:56:16 +0200
+
 mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
 
   * New upstream release: 6.4.0-beta2.
diff --git a/debian/rules b/debian/rules
index e2a1836..5d3d7b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ COMMON_CONFIG=-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_WFS=1 \
-DWITH_WCS=1 \
-DWITH_LIBXML2=1 \
-   -DWITH_THREADS=1 \
+   -DWITH_THREAD_SAFETY=1 \
-DWITH_GIF=1 \
-DWITH_PYTHON=1 \
-DWITH_PHP=1 \

-- 
Packaging for MapServer

___
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] mapcache branch, master, updated. upstream/1.0.0-50-g30debef

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 079277c5b783f6406f854c7667048120ea0579f5
Author: Bas Couwenberg 
Date:   Tue Jul 23 17:28:10 2013 +0200

Mark unreleased versions as such.

diff --git a/debian/changelog b/debian/changelog
index 72d4398..b484c6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,13 +32,13 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low
 
  -- Bas Couwenberg   Sat, 15 Jun 2013 01:34:26 +0200
 
-mapcache (1.0.0-2) unstable; urgency=low
+mapcache (1.0.0-2~ubuntu1) unstable; urgency=low
 
   * Added libmapcache.symbols
 
  -- Jerome Villeneuve Larouche   Thu, 28 Feb 2013 
10:04:43 -0500
 
-mapcache (1.0.0-1) unstable; urgency=low
+mapcache (1.0.0-1~ubuntu1) unstable; urgency=low
 
   * Initial Upstream Release
   * Added includepath.patch to change the mapserver.h path to
@@ -46,13 +46,13 @@ mapcache (1.0.0-1) unstable; urgency=low
 
  -- Jerome Villeneuve Larouche   Thu, 15 Nov 2012 
21:08:41 +
 
-mapcache (0~git052512+a8a8fe848c-1) unstable; urgency=low
+mapcache (0~git052512+a8a8fe848c-1~ubuntu1) unstable; urgency=low
 
   * New git upstream.
 
  -- Alan Boudreault   Wed, 20 Jun 2012 13:46:36 +
 
-mapcache (0.0.0~git20120526) unstable; urgency=low
+mapcache (0.0.0~git20120526~ubuntu1) unstable; urgency=low
 
   * Initial Release.
 

-- 
Packaging for MapCache

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit a77f86ede61642f4bdd82d1027b3fc74db4f29e8
Author: Bas Couwenberg 
Date:   Mon Sep 2 22:48:13 2013 +0200

Update libmapserver symbols file for 6.4.0 on amd64.

diff --git a/debian/changelog b/debian/changelog
index d45d1da..d0d5e2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
 perl-mapscript-install.patch
   * SONAME of libmapserver changed from libmapserver-6.2.1.so to
 libmapserver.so.1.
+  * Update libmapserver symbols file for 6.4.0 on amd64.
 
  -- Bas Couwenberg   Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/libmapserver1.symbols b/debian/libmapserver1.symbols
index bdfcf0c..d8f41d6 100644
--- a/debian/libmapserver1.symbols
+++ b/debian/libmapserver1.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 6.2.1 amd64 i386
+# SymbolsHelper-Confirmed: 6.4.0 amd64
 libmapserver.so.1 #PACKAGE# #MINVER#
  BuildExpressionTree@Base 6.2.1
  CleanVSIDir@Base 6.2.1
@@ -168,7 +168,7 @@ libmapserver.so.1 #PACKAGE# #MINVER#
  _ZN10ClipperLib17E2InsertsBeforeE1ERNS_5TEdgeES1_@Base 6.2.1
  _ZN10ClipperLib17FindAppendLinkEndEPNS_6OutRecE@Base 6.2.1
  _ZN10ClipperLib17GetOverlapSegmentENS_8IntPointES0_S0_S0_RS0_S1_@Base 6.2.1
- _ZN10ClipperLib17PolyOffsetBuilder8DoSquareEd@Base 6.2.1
+#MISSING: 6.4.0# _ZN10ClipperLib17PolyOffsetBuilder8DoSquareEd@Base 6.2.1
  
_ZN10ClipperLib17PolyOffsetBuilderC1ERKSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EERS6_dNS_8JoinTypeEd@Base
 6.2.1
  
_ZN10ClipperLib17PolyOffsetBuilderC2ERKSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EERS6_dNS_8JoinTypeEd@Base
 6.2.1
  _ZN10ClipperLib18GetNextNonDupOutPtEPNS_5OutPtERS1_@Base 6.2.1
@@ -255,6 +255,42 @@ libmapserver.so.1 #PACKAGE# #MINVER#
  _ZN10ClipperLiblsERSoRNS_8IntPointE@Base 6.2.1
  _ZN10ClipperLiblsERSoRSt6vectorINS_8IntPointESaIS2_EE@Base 6.2.1
  _ZN10ClipperLiblsERSoRSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EE@Base 6.2.1
+ _ZN11KmlRenderer10renderLineEP8imageObjP8shapeObjP14strokeStyleObj@Base 6.4.0
+ _ZN11KmlRenderer10startShapeEP8imageObjP8shapeObj@Base 6.4.0
+ _ZN11KmlRenderer11createImageEiiP15outputFormatObjP8colorObj@Base 6.4.0
+ _ZN11KmlRenderer12getAliasNameEP8layerObjPcPKc@Base 6.4.0
+ _ZN11KmlRenderer12getLayerNameEP8layerObj@Base 6.4.0
+ _ZN11KmlRenderer12processLayerEP8layerObjP15outputFormatObj@Base 6.4.0
+ _ZN11KmlRenderer12renderGlyphsEP8imageObjddP13labelStyleObjPc@Base 6.4.0
+ _ZN11KmlRenderer12renderSymbolEP8imageObjddP9symbolObjP14symbolStyleObj@Base 
6.4.0
+ _ZN11KmlRenderer13addCoordsNodeEP8_xmlNodeP8pointObji@Base 6.4.0
+ _ZN11KmlRenderer13closeNewLayerEP8imageObjP8layerObj@Base 6.4.0
+ _ZN11KmlRenderer13renderPolygonEP8imageObjP8shapeObjP8colorObj@Base 6.4.0
+ _ZN11KmlRenderer13startNewLayerEP8imageObjP8layerObj@Base 6.4.0
+ _ZN11KmlRenderer14flushPlacemarkEv@Base 6.4.0
+ _ZN11KmlRenderer15checkProjectionEP6mapObj@Base 6.4.0
+ _ZN11KmlRenderer15createIconImageEPcP9symbolObjP14symbolStyleObj@Base 6.4.0
+ _ZN11KmlRenderer15lookupSymbolUrlEP8imageObjP9symbolObjP14symbolStyleObj@Base 
6.4.0
+ _ZN11KmlRenderer17getGeomParentNodeEPKc@Base 6.4.0
+ _ZN11KmlRenderer17mergeRasterBufferEP8imageObjP15rasterBufferObj@Base 6.4.0
+ _ZN11KmlRenderer18addLineStyleToListEP14strokeStyleObj@Base 6.4.0
+ 
_ZN11KmlRenderer18renderPixmapSymbolEP8imageObjddP9symbolObjP14symbolStyleObj@Base
 6.4.0
+ 
_ZN11KmlRenderer18renderVectorSymbolEP8imageObjddP9symbolObjP14symbolStyleObj@Base
 6.4.0
+ _ZN11KmlRenderer19createPlacemarkNodeEP8_xmlNodePc@Base 6.4.0
+ 
_ZN11KmlRenderer19renderEllipseSymbolEP8imageObjddP9symbolObjP14symbolStyleObj@Base
 6.4.0
+ _ZN11KmlRenderer20lookupPlacemarkStyleEv@Base 6.4.0
+ 
_ZN11KmlRenderer20renderTruetypeSymbolEP8imageObjddP9symbolObjP14symbolStyleObj@Base
 6.4.0
+ _ZN11KmlRenderer20setupRenderingParamsEP12hashTableObj@Base 6.4.0
+ _ZN11KmlRenderer21createDescriptionNodeEP8shapeObj@Base 6.4.0
+ _ZN11KmlRenderer23createGroundOverlayNodeEP8_xmlNodePcP8layerObj@Base 6.4.0
+ _ZN11KmlRenderer29addAddRenderingSpecificationsEP8_xmlNode@Base 6.4.0
+ _ZN11KmlRenderer8endShapeEP8imageObjP8shapeObj@Base 6.4.0
+ _ZN11KmlRenderer9saveImageEP8imageObjP8_IO_FILEP15outputFormatObj@Base 6.4.0
+ _ZN11KmlRendererC1EiiP15outputFormatObjP8colorObj@Base 6.4.0
+ _ZN11KmlRendererC2EiiP15outputFormatObjP8colorObj@Base 6.4.0
+ _ZN11KmlRendererD0Ev@Base 6.4.0
+ _ZN11KmlRendererD1Ev@Base 6.4.0
+ _ZN11KmlRendererD2Ev@Base 6.4.0
  _ZN12line_adaptor6vertexEPdS0_@Base 6.2.1
  _ZN12line_adaptorD0Ev@Base 6.2.1
  _ZN12line_adaptorD1Ev@Base 6.2.1
@@ -263,9 +299,9 @@ libmapserver.so.1 #PACKAGE# #MINVER#
  _ZN15polygon_adaptorD0Ev@Base 6.2.1
  _ZN15polygon_adaptorD1Ev@Base 6.2.1
  _ZN15polygon_adaptorD2Ev@Base 6.2.1
- 
(optional=templinst)_ZN9mapserver10conv_curveINS_20path_storage_integerIiLj6EEENS_6curve3ENS_6curve4EE6vertexEPdS6_@Base
 6.2.1
- 
(optional=templinst)_ZN9mapserver10conv_curveINS_20path_storage_integerIsLj6EEENS_6curve3ENS_6curve4EE6vertexEPdS6_@Base
 6.2.1
- 
(optional=templinst)_Z

[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 478997425ad4e59b080a5cbc4d23d8693d525c09
Author: Bas Couwenberg 
Date:   Mon Sep 2 21:47:53 2013 +0200

SONAME of libmapserver changed from libmapserver-6.2.1.so to 
libmapserver.so.1.

diff --git a/debian/changelog b/debian/changelog
index 56cf633..d45d1da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
 install-ruby-mapscript.patch
   * Add patch to fix the Perl mapscript module installation directory:
 perl-mapscript-install.patch
+  * SONAME of libmapserver changed from libmapserver-6.2.1.so to
+libmapserver.so.1.
 
  -- Bas Couwenberg   Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/control b/debian/control
index fdf5982..a29131a 100644
--- a/debian/control
+++ b/debian/control
@@ -24,16 +24,26 @@ Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-grass/mapserver.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git
 
 Package: libmapserver
-Depends: libmapserver-6.2.1, ${misc:Depends}
+Depends: libmapserver1, ${misc:Depends}
 Architecture: all
 Section: oldlibs
-Description: Transitional dummy package for libmapserver-6.2.1
- This is a transitional dummy package to ease upgrades to the
- libmapserver-6.2.1 package. It can safely be removed.
+Description: Dummy package for libmapserver to libmapserver1 transition
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver package to the libmapserver1 package.
+ It can safely be removed.
 
 Package: libmapserver-6.2.1
-Replaces: libmapserver (<< 6.2.1-3~)
-Breaks: libmapserver (<< 6.2.1-3~)
+Depends: libmapserver1, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: Dummy package for libmapserver-6.2.1 to libmapserver1 transition
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver-6.2.1 package to the libmapserver1 package.
+ It can safely be removed.
+
+Package: libmapserver1
+Replaces: libmapserver (<< 6.2.1-3~), libmapserver-6.2.1
+Breaks: libmapserver (<< 6.2.1-3~), libmapserver-6.2.1
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -49,19 +59,29 @@ Description: Shared library for MapServer
  library packages.
 
 Package: libmapserver-dev
-Depends: libmapserver-6.2.1-dev, ${misc:Depends}
+Depends: libmapserver1-dev, ${misc:Depends}
 Architecture: all
 Section: oldlibs
-Description: Transitional dummy package for libmapserver-6.2.1-dev
- This is a transitional dummy package to ease upgrades to the
- libmapserver-6.2.1-dev package. It can safely be removed.
+Description: Transitional dummy package for libmapserver1-dev
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver-dev package to the libmapserver1-dev package.
+ It can safely be removed.
 
 Package: libmapserver-6.2.1-dev
-Replaces: libmapserver-dev (<< 6.2.1-3~)
-Breaks: libmapserver-dev (<< 6.2.1-3~)
+Depends: libmapserver1-dev, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: Dummy package for libmapserver1-dev transition
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver-6.2.1-dev package to the libmapserver1-dev package.
+ It can safely be removed.
+
+Package: libmapserver1-dev
+Replaces: libmapserver-dev (<< 6.2.1-3~), libmapserver-6.2.1-dev
+Breaks: libmapserver-dev (<< 6.2.1-3~), libmapserver-6.2.1-dev
 Section: libdevel
 Architecture: any
-Depends: libmapserver-6.2.1 (=${binary:Version}), ${misc:Depends}
+Depends: libmapserver1 (=${binary:Version}), ${misc:Depends}
 Suggests: cgi-mapserver, mapserver-bin, mapserver-doc,
  libmapscript-perl, php5-mapscript, python-mapscript, ruby-mapscript
 Description: Shared library development files for MapServer
diff --git a/debian/libmapserver-6.2.1-dev.install 
b/debian/libmapserver-6.2.1-dev.install
deleted file mode 100644
index bbe1641..000
--- a/debian/libmapserver-6.2.1-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/mapserver-config
-usr/include/mapserver/*
-usr/lib/*/libmapserver.la
-usr/lib/*/libmapserver.so
diff --git a/debian/libmapserver-6.2.1-dev.manpages 
b/debian/libmapserver-6.2.1-dev.manpages
deleted file mode 100644
index 4951557..000
--- a/debian/libmapserver-6.2.1-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/mapserver-config.1
diff --git a/debian/libmapserver-6.2.1.install 
b/debian/libmapserver-6.2.1.install
deleted file mode 100644
index 01666b4..000
--- a/debian/libmapserver-6.2.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libmapserver-*.so
diff --git a/debian/libmapserver1-dev.install b/debian/libmapserver1-dev.install
new file mode 100644
index 000..37c593f
--- /dev/null
+++ b/debian/libmapserver1-dev.install
@@ -0,0 +1,2 @@
+usr/include/mapserver/*
+usr/lib/*/libmapserver.so
diff --git a/debian/libmapserver1.install b/debian/libmapserver1.install
new file mode 100644
index 000..d66fe12
--- /dev/null
+++ b/debian/libmapserver1.install
@@ -0,0 +1 @@
+usr/lib/*/lib

[SCM] mapcache branch, master, updated. upstream/1.0.0-50-g30debef

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 30debef770a123ca35746a2a6f56359426b67d24
Author: Bas Couwenberg 
Date:   Tue Jul 23 20:01:24 2013 +0200

Use www in Homepage URL.

diff --git a/debian/control b/debian/control
index c8eaced..61477ab 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), 
autotools-dev,
  autoconf, dh-autoreconf, chrpath,
  docbook2x, docbook-xsl, docbook-xml, xsltproc
 Standards-Version: 3.9.4
-Homepage: http://mapserver.org/en/mapcache/
+Homepage: http://www.mapserver.org/en/mapcache/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapcache.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/mapcache.git
 

-- 
Packaging for MapCache

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 06b1f82c860a74f8fa76ae7f887126659c1beba6
Merge: a77f86ede61642f4bdd82d1027b3fc74db4f29e8 
d3dd19a5194edf20555c2f7b0be57a3942341189
Author: Bas Couwenberg 
Date:   Wed Sep 11 17:42:23 2013 +0200

Merge upstream version 6.4.0-rc1.


-- 
Packaging for MapServer

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 388401bfcd886a93542c9a5857b5375ae0b6dd4f
Author: Bas Couwenberg 
Date:   Sun Sep 1 17:31:31 2013 +0200

Drop obsolete patch: fixmapscriptvars.patch.

diff --git a/debian/changelog b/debian/changelog
index 9b39ab0..18b4414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
   * Build system changed from autotools to cmake.
   * Update Build-Depends to include: libgif-dev, librsvg2-dev, pkg-config.
   * Update hardening.patch for CMake build.
+  * Drop patches:
+- fixmapscriptvars.patch (mapscriptvars no longer used)
 
  -- Bas Couwenberg   Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/fixmapscriptvars.patch 
b/debian/patches/fixmapscriptvars.patch
deleted file mode 100644
index 24d5ecd..000
--- a/debian/patches/fixmapscriptvars.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix mapscriptvars to send the right argument to ld.
-Author: Jerome Villeneuve Larouche 
-Last-Update: 2012-11-15
 a/Makefile.in
-+++ b/Makefile.in
-@@ -415,7 +415,7 @@ mapscriptvars: Makefile
-   echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ 
>> mapscriptvars
-   echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) 
$(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
-   echo $(LIBMAP) >> mapscriptvars
--  echo $(EXE_LDFLAGS) >> mapscriptvars
-+  echo -Wl,$(EXE_LDFLAGS) >> mapscriptvars
-   grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
- 
- mapserver-config: Makefile
diff --git a/debian/patches/series b/debian/patches/series
index 981b3de..3dcc945 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fixmapscriptvars.patch
 php_segfault.patch
 mapows-contenttype.patch
 hardening.patch

-- 
Packaging for MapServer

___
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] mapcache branch, jessie, updated. upstream/1.0.0-50-g30debef

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the jessie branch:
commit 079277c5b783f6406f854c7667048120ea0579f5
Author: Bas Couwenberg 
Date:   Tue Jul 23 17:28:10 2013 +0200

Mark unreleased versions as such.

diff --git a/debian/changelog b/debian/changelog
index 72d4398..b484c6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,13 +32,13 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low
 
  -- Bas Couwenberg   Sat, 15 Jun 2013 01:34:26 +0200
 
-mapcache (1.0.0-2) unstable; urgency=low
+mapcache (1.0.0-2~ubuntu1) unstable; urgency=low
 
   * Added libmapcache.symbols
 
  -- Jerome Villeneuve Larouche   Thu, 28 Feb 2013 
10:04:43 -0500
 
-mapcache (1.0.0-1) unstable; urgency=low
+mapcache (1.0.0-1~ubuntu1) unstable; urgency=low
 
   * Initial Upstream Release
   * Added includepath.patch to change the mapserver.h path to
@@ -46,13 +46,13 @@ mapcache (1.0.0-1) unstable; urgency=low
 
  -- Jerome Villeneuve Larouche   Thu, 15 Nov 2012 
21:08:41 +
 
-mapcache (0~git052512+a8a8fe848c-1) unstable; urgency=low
+mapcache (0~git052512+a8a8fe848c-1~ubuntu1) unstable; urgency=low
 
   * New git upstream.
 
  -- Alan Boudreault   Wed, 20 Jun 2012 13:46:36 +
 
-mapcache (0.0.0~git20120526) unstable; urgency=low
+mapcache (0.0.0~git20120526~ubuntu1) unstable; urgency=low
 
   * Initial Release.
 

-- 
Packaging for MapCache

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 51751ba83c895d1ef24986bf17e1903cf2e392ad
Author: Bas Couwenberg 
Date:   Sat Sep 7 21:12:07 2013 +0200

Drop patch install-ruby-mapscript.patch, applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 76315c4..62ce886 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
 
   * New upstream release: 6.4.0-rc1.
   * Rename WITH_THREADS to WITH_THREAD_SAFETY.
+  * Drop patch install-ruby-mapscript.patch, applied upstream.
 
  -- Bas Couwenberg   Sat, 07 Sep 2013 20:56:16 +0200
 
diff --git a/debian/patches/install-ruby-mapscript.patch 
b/debian/patches/install-ruby-mapscript.patch
deleted file mode 100644
index f825f68..000
--- a/debian/patches/install-ruby-mapscript.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Install Ruby mapscript with CMake
-Author: Bas Couwenberg 
-Bug: https://github.com/mapserver/mapserver/pull/4749
-Applied-Upstream: 6.4.0, 
https://github.com/mapserver/mapserver/commit/1cfdd59ff246d7c8b74a1894a30232600ea67fe2
-Last-Update: 2013-09-02
 a/mapscript/ruby/CMakeLists.txt
-+++ b/mapscript/ruby/CMakeLists.txt
-@@ -12,9 +12,6 @@ SWIG_LINK_LIBRARIES(rubymapscript ${RUBY
- set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES 
PREFIX "")
- set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES 
OUTPUT_NAME mapscript)
- 
--#get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_mapscript_REAL_NAME} 
LOCATION)
--#set(mapscript_files ${LOC_MAPSCRIPT_LIB} 
${CMAKE_CURRENT_BINARY_DIR}/mapscript.py)
--#install(FILES ${mapscript_files} DESTINATION ${PYTHON_SITE_PACKAGES})
--
--#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py DESTINATION 
${PYTHON_SITE_PACKAGES})
--#install(TARGETS mapscript DESTINATION ${PYTHON_SITE_PACKAGES})
-+get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME} 
LOCATION)
-+execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts 
RbConfig::CONFIG['archdir']" OUTPUT_VARIABLE RUBY_ARCHDIR 
OUTPUT_STRIP_TRAILING_WHITESPACE)
-+install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_ARCHDIR})
diff --git a/debian/patches/series b/debian/patches/series
index f4ce7d1..d157b06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 hardening.patch
 ruby-shebang.patch
-install-ruby-mapscript.patch
 perl-mapscript-install.patch

-- 
Packaging for MapServer

___
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] mapserver branch, upstream, updated. upstream/6.2.1-3-gd3dd19a

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the upstream branch:
commit d3dd19a5194edf20555c2f7b0be57a3942341189
Author: Bas Couwenberg 
Date:   Wed Sep 11 15:14:37 2013 +0200

Imported Upstream version 6.4.0-rc1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfaa22d..8c5ef1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ include(CheckCSourceCompiles)
 set (MapServer_VERSION_MAJOR 6)
 set (MapServer_VERSION_MINOR 4)
 set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-beta2")
+set (MapServer_VERSION_SUFFIX "-rc1")
 
 set(TARGET_VERSION_MAJOR ${MapServer_VERSION_MAJOR})
 set(TARGET_VERSION_MINOR ${MapServer_VERSION_MINOR})
@@ -111,7 +111,7 @@ option(WITH_CURL "Enable Curl HTTP support (required for 
wms/wfs client, and rem
 option(WITH_WFS "Enable WFS Server support (requires PROJ and OGR support)" ON)
 option(WITH_WCS "Enable WCS Server support (requires PROJ and GDAL support)" 
ON)
 option(WITH_LIBXML2 "Choose if libxml2 support should be built in (used for 
sos, wcs 1.1,2.0 and wfs 1.1)" ON)
-option(WITH_THREADS "Choose if a thread-safe version of libmapserver should be 
built (only recommended for some mapscripts)" OFF)
+option(WITH_THREAD_SAFETY "Choose if a thread-safe version of libmapserver 
should be built (only recommended for some mapscripts)" OFF)
 option(WITH_GIF "Enable GIF support (for PIXMAP loading)" ON)
 option(WITH_PYTHON "Enable Python mapscript support" OFF)
 option(WITH_PHP "Enable Python mapscript support" OFF)
@@ -665,14 +665,14 @@ if(WITH_KML)
   endif(USE_LIBXML2)
 endif(WITH_KML)
 
-if(WITH_THREADS)
+if(WITH_THREAD_SAFETY)
   set( CMAKE_THREAD_PREFER_PTHREAD 1 )
   find_package(Threads)
   if (THREADS_FOUND)
 ms_link_libraries( ${CMAKE_THREAD_LIBS_INIT})
 set(USE_THREAD 1)
   endif (THREADS_FOUND)
-endif(WITH_THREADS)
+endif(WITH_THREAD_SAFETY)
 
 if(WITH_XMLMAPFILE)
if(NOT USE_LIBXML2)
diff --git a/Makefile b/Makefile
index 84fe524..f265ff5 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ YACC=yacc
 CMAKEFLAGS=-DCMAKE_C_FLAGS="--coverage" -DCMAKE_CXX_FLAGS="--coverage" \
  -DCMAKE_SHARED_LINKER_FLAGS="-lgcov" -DWITH_GD=1 
-DWITH_CLIENT_WMS=1 \
  -DWITH_CLIENT_WFS=1 -DWITH_KML=1 -DWITH_SOS=1 
-DWITH_PHP=1 \
- -DWITH_PYTHON=1 -DWITH_JAVA=1 -DWITH_THREADS=1 
-DWITH_FRIBIDI=0 -DWITH_FCGI=0 -DWITH_EXEMPI=1 \
+ -DWITH_PYTHON=1 -DWITH_JAVA=1 -DWITH_THREAD_SAFETY=1 
-DWITH_FRIBIDI=0 -DWITH_FCGI=0 -DWITH_EXEMPI=1 \
  -DCMAKE_BUILD_TYPE=Release -DWITH_RSVG=1 -DWITH_CURL=1
 all: cmakebuild
 
diff --git a/mapdraw.c b/mapdraw.c
index 35f7a53..992838d 100644
--- a/mapdraw.c
+++ b/mapdraw.c
@@ -2076,6 +2076,9 @@ int msDrawShape(mapObj *map, layerObj *layer, shapeObj 
*shape, imageObj *image,
   }
   maxsize = MS_MAX(msSymbolGetDefaultSize(symbol), MS_MAX(style->size, 
style->width));
   maxunscaledsize = MS_MAX(style->minsize*image->resolutionfactor, 
style->minwidth*image->resolutionfactor);
+  if(shape->type == MS_SHAPE_POLYGON && 
!IS_PARALLEL_OFFSET(style->offsety)) {
+ maxsize += MS_MAX(fabs(style->offsety),fabs(style->offsetx));
+  }
   clip_buf = MS_MAX(clip_buf,MS_NINT(MS_MAX(maxsize * layer->scalefactor, 
maxunscaledsize) + 1));
 }
 
diff --git a/mapfile.c b/mapfile.c
index 18c1c27..1389d49 100644
--- a/mapfile.c
+++ b/mapfile.c
@@ -554,23 +554,30 @@ static void writeCharacter(FILE *stream, int indent, 
const char *name, const cha
 
 static void writeString(FILE *stream, int indent, const char *name, const char 
*defaultString, char *string)
 {
-  char *string_tmp;
+  char *string_escaped;
 
   if(!string) return;
   if(defaultString && strcmp(string, defaultString) == 0) return;
   writeIndent(stream, ++indent);
   if(name) msIO_fprintf(stream, "%s ", name);
-  if ( (strchr(string, '\'') == NULL) && (strchr(string, '\"') == NULL))
-msIO_fprintf(stream, "\"%s\"\n", string);
-  else if ( (strchr(string, '\"') != NULL) && (strchr(string, '\'') == NULL))
-msIO_fprintf(stream, "'%s'\n", string);
-  else if ( (strchr(string, '\'') != NULL) && (strchr(string, '\"') == NULL))
-msIO_fprintf(stream, "\"%s\"\n", string);
+  if(strchr(string,'\\')) {
+string_escaped = msStrdup(string);
+string_escaped = msReplaceSubstring(string_escaped,"\\","");
+  } else {
+string_escaped = string;
+  }
+  if ( (strchr(string_escaped, '\'') == NULL) && (strchr(string_escaped, '\"') 
== NULL))
+msIO_fprintf(stream, "\"%s\"\n", string_escaped);
+  else if ( (strchr(string_escaped, '\"') != NULL) && (strchr(string_escaped, 
'\'') == NULL))
+msIO_fprintf(stream, "'%s'\n", string_escaped);
+  else if ( (strchr(string_escaped, '\'') != NULL) && (strchr(string_escaped, 
'\"') == NULL))
+msIO_fprintf(stream, "\"%s\"\n", string_escaped);
   else {
-string_tmp = msStringEscape(string);
+char *string_tmp = msStringEscape(string_escaped);
 msIO_fprintf(stream, "\

[SCM] mapserver annotated tag, upstream/6.4.0_beta2, updated. upstream/6.4.0_beta2

2013-09-11 Thread Bas Couwenberg

The annotated tag, upstream/6.4.0_beta2 has been updated
to  2aaa351ed1e8a24cac6db86e5d50273beae37c22 (tag)
  from  56a0ab5ee8105ce243b174d3223e645c4322b0b8 (which is now obsolete)
   tagging  56a0ab5ee8105ce243b174d3223e645c4322b0b8 (commit)
  replaces  upstream/6.4.0_beta1
 tagged by  Bas Couwenberg
on  Wed Sep 11 18:03:33 2013 +0200

- Shortlog 
Upstream version 6.4.0-beta2

Bas Couwenberg (1):
  Imported Upstream version 6.4.0-beta2

---

-- 
Packaging for MapServer

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit c8fa9158ffaf7afbada3709e72122c741c34ce19
Author: Bas Couwenberg 
Date:   Wed Sep 11 11:58:05 2013 +0200

Add patch to install ruby mapscript into vendorarchdir instead of archdir.

diff --git a/debian/changelog b/debian/changelog
index c6f0585..ec37a4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
   * Rename WITH_THREADS to WITH_THREAD_SAFETY.
   * Drop patch install-ruby-mapscript.patch, applied upstream.
   * Add patch to rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE.
+  * Add patch to install ruby mapscript into vendorarchdir instead of archdir.
 
  -- Bas Couwenberg   Sat, 07 Sep 2013 20:56:16 +0200
 
diff --git a/debian/patches/ruby-mapscript-install.patch 
b/debian/patches/ruby-mapscript-install.patch
new file mode 100644
index 000..9e45736
--- /dev/null
+++ b/debian/patches/ruby-mapscript-install.patch
@@ -0,0 +1,13 @@
+Description: Install Ruby mapscript to vendorarchdir instead of archdir.
+Author: Bas Couwenberg 
+Last-Update: 2013-09-11
+--- a/mapscript/ruby/CMakeLists.txt
 b/mapscript/ruby/CMakeLists.txt
+@@ -30,5 +30,5 @@ set_target_properties(${SWIG_MODULE_ruby
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES 
OUTPUT_NAME mapscript)
+ 
+ get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME} 
LOCATION)
+-execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts 
RbConfig::CONFIG['archdir']" OUTPUT_VARIABLE RUBY_ARCHDIR 
OUTPUT_STRIP_TRAILING_WHITESPACE)
+-install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_ARCHDIR})
++execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts 
RbConfig::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDORARCHDIR 
OUTPUT_STRIP_TRAILING_WHITESPACE)
++install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_VENDORARCHDIR})
diff --git a/debian/patches/series b/debian/patches/series
index b1b1b94..b8dc8f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ hardening.patch
 ruby-shebang.patch
 perl-mapscript-install.patch
 install-threads.patch
+ruby-mapscript-install.patch
diff --git a/debian/ruby-mapscript.install b/debian/ruby-mapscript.install
index 1b95a42..f3e7ea1 100644
--- a/debian/ruby-mapscript.install
+++ b/debian/ruby-mapscript.install
@@ -1 +1 @@
-usr/lib/ruby/*/*/mapscript.so
+usr/lib/ruby/vendor_ruby/*/*/mapscript.so

-- 
Packaging for MapServer

___
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] mapserver tag, upstream/6.4.0_beta2, created. upstream/6.2.1-2-g56a0ab5

2013-09-11 Thread Bas Couwenberg

The tag, upstream/6.4.0_beta2 has been created
at  56a0ab5ee8105ce243b174d3223e645c4322b0b8 (commit)

- Shortlog 
commit 56a0ab5ee8105ce243b174d3223e645c4322b0b8
Author: Bas Couwenberg 
Date:   Wed Sep 11 14:59:53 2013 +0200

Imported Upstream version 6.4.0-beta2
---

-- 
Packaging for MapServer

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 26d0a2836f69dbe0d2c6c3567a3d057924e95ee7
Author: Bas Couwenberg 
Date:   Mon Sep 2 21:25:57 2013 +0200

Add patch to fix the Perl mapscript module installation directory: 
perl-mapscript-install.patch.

diff --git a/debian/changelog b/debian/changelog
index 0f9e04c..56cf633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
 - shp2img-typo.patch (applied upstream)
   * Add patch to install the Ruby mapscript extension:
 install-ruby-mapscript.patch
+  * Add patch to fix the Perl mapscript module installation directory:
+perl-mapscript-install.patch
 
  -- Bas Couwenberg   Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/libmapscript-perl.install b/debian/libmapscript-perl.install
new file mode 100644
index 000..1312331
--- /dev/null
+++ b/debian/libmapscript-perl.install
@@ -0,0 +1 @@
+usr/lib/perl5/
diff --git a/debian/patches/perl-mapscript-install.patch 
b/debian/patches/perl-mapscript-install.patch
new file mode 100644
index 000..2a639cf
--- /dev/null
+++ b/debian/patches/perl-mapscript-install.patch
@@ -0,0 +1,23 @@
+Description: Fix the Perl mapscript module installation directory.
+Author: Bas Couwenberg 
+Last-Update: 2013-09-02
+--- a/mapscript/perl/CMakeLists.txt
 b/mapscript/perl/CMakeLists.txt
+@@ -2,7 +2,7 @@ FIND_PACKAGE(SWIG REQUIRED)
+ INCLUDE(${SWIG_USE_FILE})
+ FIND_PACKAGE(Perl REQUIRED)
+ FIND_PACKAGE(PerlLibs REQUIRED)
+-set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITEARCH} CACHE DIR "Custom installation 
directory for perl binary extension")
++set(CUSTOM_PERL_VENDOR_ARCH_DIR ${PERL_VENDORARCH} CACHE DIR "Custom 
installation directory for perl binary extension")
+ INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH})
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/swiginc)
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/)
+@@ -20,6 +20,6 @@ endif(APPLE)
+ 
+ get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_perlmapscript_REAL_NAME} 
LOCATION)
+ set(mapscript_files ${LOC_MAPSCRIPT_LIB} 
${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm)
+-install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION 
${CUSTOM_PERL_SITE_ARCH_DIR}/auto/mapscript)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm DESTINATION 
${CUSTOM_PERL_SITE_ARCH_DIR})
++install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION 
${CUSTOM_PERL_VENDOR_ARCH_DIR}/auto/mapscript)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm DESTINATION 
${CUSTOM_PERL_VENDOR_ARCH_DIR})
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8f553f0..f4ce7d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 hardening.patch
 ruby-shebang.patch
 install-ruby-mapscript.patch
+perl-mapscript-install.patch

-- 
Packaging for MapServer

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit b9328f2a86183d015a3da1510114f4e160144626
Author: Bas Couwenberg 
Date:   Mon Sep 2 21:20:42 2013 +0200

Add patch to install the Ruby mapscript extension: 
install-ruby-mapscript.patch.

diff --git a/debian/changelog b/debian/changelog
index 5bec8c1..0f9e04c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
 - php_segfault.patch (applied upstream)
 - mapows-contenttype.patch (applied upstream)
 - shp2img-typo.patch (applied upstream)
+  * Add patch to install the Ruby mapscript extension:
+install-ruby-mapscript.patch
 
  -- Bas Couwenberg   Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/install-ruby-mapscript.patch 
b/debian/patches/install-ruby-mapscript.patch
new file mode 100644
index 000..f825f68
--- /dev/null
+++ b/debian/patches/install-ruby-mapscript.patch
@@ -0,0 +1,20 @@
+Description: Install Ruby mapscript with CMake
+Author: Bas Couwenberg 
+Bug: https://github.com/mapserver/mapserver/pull/4749
+Applied-Upstream: 6.4.0, 
https://github.com/mapserver/mapserver/commit/1cfdd59ff246d7c8b74a1894a30232600ea67fe2
+Last-Update: 2013-09-02
+--- a/mapscript/ruby/CMakeLists.txt
 b/mapscript/ruby/CMakeLists.txt
+@@ -12,9 +12,6 @@ SWIG_LINK_LIBRARIES(rubymapscript ${RUBY
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES 
PREFIX "")
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES 
OUTPUT_NAME mapscript)
+ 
+-#get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_mapscript_REAL_NAME} 
LOCATION)
+-#set(mapscript_files ${LOC_MAPSCRIPT_LIB} 
${CMAKE_CURRENT_BINARY_DIR}/mapscript.py)
+-#install(FILES ${mapscript_files} DESTINATION ${PYTHON_SITE_PACKAGES})
+-
+-#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py DESTINATION 
${PYTHON_SITE_PACKAGES})
+-#install(TARGETS mapscript DESTINATION ${PYTHON_SITE_PACKAGES})
++get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME} 
LOCATION)
++execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts 
RbConfig::CONFIG['archdir']" OUTPUT_VARIABLE RUBY_ARCHDIR 
OUTPUT_STRIP_TRAILING_WHITESPACE)
++install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_ARCHDIR})
diff --git a/debian/patches/series b/debian/patches/series
index 49df62d..8f553f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 hardening.patch
 ruby-shebang.patch
+install-ruby-mapscript.patch
diff --git a/debian/ruby-mapscript.install b/debian/ruby-mapscript.install
new file mode 100644
index 000..1b95a42
--- /dev/null
+++ b/debian/ruby-mapscript.install
@@ -0,0 +1 @@
+usr/lib/ruby/*/*/mapscript.so

-- 
Packaging for MapServer

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 6897e8652cdd90e6d27c330bd03d89e802fb3933
Author: Bas Couwenberg 
Date:   Sun Sep 1 17:35:32 2013 +0200

Drop obsolete patch: mapows-contenttype.patch.

diff --git a/debian/changelog b/debian/changelog
index 2e389c1..5737efe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
   * Drop patches:
 - fixmapscriptvars.patch (mapscriptvars no longer used)
 - php_segfault.patch (applied upstream)
+- mapows-contenttype.patch (applied upstream)
 
  -- Bas Couwenberg   Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/mapows-contenttype.patch 
b/debian/patches/mapows-contenttype.patch
deleted file mode 100644
index 78ffcca..000
--- a/debian/patches/mapows-contenttype.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Handle Content-Type HTTP headers with a charset appended.
-Author: Bas Couwenberg 
-Bug: https://github.com/mapserver/mapserver/pull/4663
-Applied-Upstream: 6.2.2, 
https://github.com/mapserver/mapserver/commit/72a9a19831c2e434e7beb0fc55acadbfdc26cfd1
-Last-Update: 2013-06-04
 a/mapows.c
-+++ b/mapows.c
-@@ -95,7 +95,7 @@ static int msOWSPreParseRequest(cgiReque
- owsRequestObj *ows_request)
- {
-   /* decide if KVP or XML */
--  if (request->type == MS_GET_REQUEST || (request->type == MS_POST_REQUEST && 
strcmp(request->contenttype, "application/x-www-form-urlencoded")==0)) {
-+  if (request->type == MS_GET_REQUEST || (request->type == MS_POST_REQUEST && 
strncmp(request->contenttype, "application/x-www-form-urlencoded", 
strlen("application/x-www-form-urlencoded")) == 0)) {
- int i;
- /* parse KVP parameters service, version and request */
- for (i = 0; i < request->NumParams; ++i) {
diff --git a/debian/patches/series b/debian/patches/series
index fe578cb..f7d70be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-mapows-contenttype.patch
 hardening.patch
 shp2img-typo.patch
 ruby-shebang.patch

-- 
Packaging for MapServer

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit e51ab8ea4f8a0eed868ea6ad8fe08933c791cbe4
Author: Bas Couwenberg 
Date:   Sun Sep 1 17:33:46 2013 +0200

Drop obsolete patch: php_segfault.patch.

diff --git a/debian/changelog b/debian/changelog
index 18b4414..2e389c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
   * Update hardening.patch for CMake build.
   * Drop patches:
 - fixmapscriptvars.patch (mapscriptvars no longer used)
+- php_segfault.patch (applied upstream)
 
  -- Bas Couwenberg   Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/php_segfault.patch 
b/debian/patches/php_segfault.patch
deleted file mode 100644
index 2f36265..000
--- a/debian/patches/php_segfault.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix segfault in ms_newMapObjFromString (PHP/MapScript).
-Author: Alan Boudreault 
-Applied-Upstream: 6.2.2, 
https://github.com/mapserver/mapserver/commit/dc3915db24d73d00e188c0537476eac6639853a6
-Last-Update: 2013-06-14
 a/mapscript/php/php_mapscript.c
-+++ b/mapscript/php/php_mapscript.c
-@@ -169,7 +169,7 @@
-   map = mapObj_newFromString(string, path);
- 
-   if (map == NULL) {
--mapscript_throw_mapserver_exception("Failed to open map file \"%s\", or 
map file error." TSRMLS_CC,  string);
-+mapscript_throw_mapserver_exception("Error while loading map file from 
string." TSRMLS_CC);
- return;
-   }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 3dcc945..fe578cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-php_segfault.patch
 mapows-contenttype.patch
 hardening.patch
 shp2img-typo.patch

-- 
Packaging for MapServer

___
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] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit d513c17991ff8e7fbb4e79b5467a000b3c0e02ca
Author: Bas Couwenberg 
Date:   Sun Sep 1 15:55:47 2013 +0200

Build system changed from autotools to cmake.
Update Build-Depends to include: libgif-dev, librsvg2-dev, pkg-config.

diff --git a/debian/changelog b/debian/changelog
index 27bc391..d97530e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
+
+  * New upstream release: 6.4.0-beta2.
+  * Build system changed from autotools to cmake.
+  * Update Build-Depends to include: libgif-dev, librsvg2-dev, pkg-config.
+
+ -- Bas Couwenberg   Sun, 01 Sep 2013 14:14:54 +0200
+
 mapserver (6.2.1-4) unstable; urgency=low
 
   * Use pkgkde-gensymbols & pkgkde-symbolshelper to handle C++ symbols.
diff --git a/debian/control b/debian/control
index d9a2dc4..fdf5982 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,18 @@ Priority: optional
 Maintainer: Debian GIS Project 
 Uploaders: Francesco Paolo Lovergine , Alan Boudreault 
, Bas Couwenberg 
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), autotools-dev,
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1),
  libcurl4-gnutls-dev, libpng-dev, libjpeg-dev, zlib1g-dev (>= 1.1.4),
  libgd-dev (>= 2.1.0~rc1-2), libfreetype6-dev (>= 2.0.9),
  libgdal1-dev (>= 1.9.0), libproj-dev, libgeos-dev (>= 3.3.1-1~),
  libfribidi-dev, libcairo2-dev,
+ libgif-dev, librsvg2-dev,
  libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 
2.6.6-3~),
  ruby1.9.1, ruby1.9.1-dev,
  sharutils, libsdl1.2-dev,
  libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, 
libreadline-dev,
  libedit-dev, libepsilon-dev, pkg-kde-tools,
- autoconf, dh-autoreconf, chrpath, 
+ chrpath, cmake (>= 2.8.0), pkg-config,
  docbook2x, docbook-xsl, docbook-xml, xsltproc
 Build-Conflicts: libcurl3-openssl-dev
 XS-Ruby-Versions: ruby1.9.1
diff --git a/debian/python-mapscript.install b/debian/python-mapscript.install
new file mode 100644
index 000..2453ce7
--- /dev/null
+++ b/debian/python-mapscript.install
@@ -0,0 +1 @@
+usr/lib/python*/
diff --git a/debian/rules b/debian/rules
index 68fa351..e2a1836 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,96 +12,84 @@ export DH_OPTIONS
 #  pie: causes build failure
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 
+DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 CFLAGS+=$(CPPFLAGS)
+CFLAGS+=$(LDFLAGS)
 
-# Perl mapscript requires CPPFLAGS & LDFLAGS in CFLAGS
-PERL_CFLAGS=$(CFLAGS)
-PERL_CFLAGS+=$(LDFLAGS)
-
-# Ruby mapscript fails to build with -Werror=format-security
-RUBY_CPPFLAGS=$(subst -Werror=format-security,,$(CFLAGS))
-RUBY_CPPFLAGS+=$(LDFLAGS)
- 
 PYVERS=$(shell pyversions -r debian/control)
 RUBYVERS=1.9.1
 PHP5API=$(shell php-config5 --phpapi)
 MANPAGES:=$(wildcard debian/man/*.*.xml)
 
-MS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
-
-COMMON_CONFIG= --prefix=/usr \
-   --with-gd=/usr \
-   --with-freetype=/usr \
-   --with-fribidi-config \
-   --with-gdal \
-   --with-ogr \
-   --with-proj \
-   --with-postgis \
-   --with-wcs \
-   --with-sos \
-   --with-wms \
-   --with-wmsclient \
-   --with-wfs \
-   --with-wfsclient \
-   --with-threads \
-   --with-geos \
-   --with-fastcgi \
-   --with-php \
-   --with-cairo
-
-MS_CFLAGS=$(CFLAGS)
-MS_CXXFLAGS=$(CFLAGS)
-MS_CPPFLAGS=$(CPPFLAGS)
-MS_LDFLAGS=$(LDFLAGS)
+MS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' 
| sed -ne 's/^\(.*\)~.*/\1/p')
+
+COMMON_CONFIG= -DCMAKE_INSTALL_PREFIX=/usr \
+   -DWITH_PROJ=1 \
+   -DWITH_KML=1 \
+   -DWITH_SOS=1 \
+   -DWITH_WMS=1 \
+   -DWITH_GD=1 \
+   -DWITH_FRIBIDI=1 \
+   -DWITH_ICONV=1 \
+   -DWITH_CAIRO=1 \
+   -DWITH_SVGCAIRO=0 \
+   -DWITH_RSVG=1 \
+   -DWITH_MYSQL=0 \
+   -DWITH_FCGI=1 \
+   -DWITH_GEOS=1 \
+   -DWITH_POSTGIS=1 \
+   -DWITH_GDAL=1 \
+   -DWITH_OGR=1 \
+   -DWITH_CURL=1 \
+   -DWITH_CLIENT_WMS=1 \
+   -DWITH_CLIENT_WFS=1 \
+   -DWITH_WFS=1 \
+   -DWITH_WCS=1 \
+   -DWITH_LIBXML2=1 \
+   -DWITH_THREADS=1 \
+   -DWITH_GIF=1 \
+   -DWITH_PYTHON=1 \
+   -DWITH_PHP=1 \
+   -DWITH_PERL=1 \
+   -DWITH_RUBY=1 \
+   -DWITH_JAVA=0 \
+   -DWIT

[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

2013-09-11 Thread Bas Couwenberg

The following commit has been merged in the master branch:
commit 1dbb73ee7bceac49ced38ae145d9d2b02303edc4
Merge: d8046e4997b434728e39fce3ea0a38f1f0966ff9 
56a0ab5ee8105ce243b174d3223e645c4322b0b8
Author: Bas Couwenberg 
Date:   Wed Sep 11 15:57:34 2013 +0200

Merge upstream version 6.4.0-beta2.


-- 
Packaging for MapServer

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

postgis_2.1.0-2_amd64.changes is NEW

2013-09-11 Thread Debian FTP Masters

binary:postgresql-9.3-postgis-2.1 is NEW.
binary:postgresql-9.3-postgis-2.1-scripts is NEW.

Your package contains new components which requires manual editing of
the override file.  It is ok otherwise, so please be patient.  New
packages are usually added to the override file about once a week.

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

Processing of postgis_2.1.0-2_amd64.changes

2013-09-11 Thread Debian FTP Masters

postgis_2.1.0-2_amd64.changes uploaded successfully to localhost
along with the files:
  postgis_2.1.0-2.dsc
  postgis_2.1.0-2.debian.tar.gz
  postgis_2.1.0-2_amd64.deb
  liblwgeom-2.1.0_2.1.0-2_amd64.deb
  liblwgeom-dev_2.1.0-2_amd64.deb
  postgresql-9.3-postgis-2.1_2.1.0-2_amd64.deb
  postgis-doc_2.1.0-2_all.deb
  libpostgis-java_2.1.0-2_all.deb
  postgresql-9.3-postgis-2.1-scripts_2.1.0-2_all.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

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

postgis_2.1.0-2_i386.changes REJECTED

2013-09-11 Thread Debian FTP Masters



ACL dm: NEW uploads are not allowed

===

Please feel free to respond to this email if you don't understand why
your files were rejected, or if you upload new files which address our
concerns.


___
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] postgis tag, debian/2.1.0-2, created. upstream/2.0.1-88-g6e83235

2013-09-11 Thread Markus Wanner

The tag, debian/2.1.0-2 has been created
at  6e832359f7dbd3f04f27d730e31cc4b75463843d (commit)

- Shortlog 
commit 6e832359f7dbd3f04f27d730e31cc4b75463843d
Author: Markus Wanner 
Date:   Wed Sep 11 13:58:40 2013 +0200

Finalize for upload of 2.1.0-2 to unstable.
---

-- 
PostGIS for PostgreSQL

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

Processing of postgis_2.1.0-2_i386.changes

2013-09-11 Thread Debian FTP Masters

postgis_2.1.0-2_i386.changes uploaded successfully to localhost
along with the files:
  postgis_2.1.0-2.dsc
  postgis_2.1.0-2.debian.tar.gz
  postgis_2.1.0-2_i386.deb
  liblwgeom-2.1.0_2.1.0-2_i386.deb
  liblwgeom-dev_2.1.0-2_i386.deb
  postgresql-9.3-postgis-2.1_2.1.0-2_i386.deb
  postgis-doc_2.1.0-2_all.deb
  libpostgis-java_2.1.0-2_all.deb
  postgresql-9.3-postgis-2.1-scripts_2.1.0-2_all.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

___
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] postgis branch, master, updated. upstream/2.0.1-88-g6e83235

2013-09-11 Thread Markus Wanner

The following commit has been merged in the master branch:
commit 6e832359f7dbd3f04f27d730e31cc4b75463843d
Author: Markus Wanner 
Date:   Wed Sep 11 13:58:40 2013 +0200

Finalize for upload of 2.1.0-2 to unstable.

diff --git a/debian/changelog b/debian/changelog
index 1cf3c15..7c8c59a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-postgis (2.1.0-2) UNRELEASED; urgency=low
+postgis (2.1.0-2) unstable; urgency=low
 
   * Correct generation of debian/control: drop an unnecessary grep in
 debian/pgversions. I broke it when changing to '9.0+'.

-- 
PostGIS for PostgreSQL

___
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] grass branch, master, updated. upstream/6.4.1-124-g3e0161d

2013-09-11 Thread M. Hamish Bowman

The following commit has been merged in the master branch:
commit 3e0161dac38aa759e00e04b351772e8900239b2f
Author: M. Hamish Bowman 
Date:   Wed Sep 11 21:18:25 2013 +1200

Prepare for libtiff-dev transition. Keep libtiff5-dev first in the OR 
series otherwise it auto-pulls in libtiff4-dev which doesn't support BigTiff. 
(see http://debian-release/2013/05/msg00127.html)

diff --git a/debian/changelog b/debian/changelog
index a7ba1bc..1d49914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ grass (6.4.3-1) unstable; urgency=low
   * Build-Depends on libmotif-dev for Motif transition.
 (closes: #714679)
   * Partial enable of the hardening flags.
+  * Prepare for libtiff-dev transition. (debian-release/2013/05/msg00127.html)
 
- -- M. Hamish Bowman   Tue, 10 Sep 2013 12:50:42 +1200
+ -- M. Hamish Bowman   Wed, 11 Sep 2013 14:17:50 +1200
 
 grass (6.4.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c0e8c56..159729a 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-depends:
   libglu1-mesa-dev | libglu1-xorg-dev, 
   libjpeg-dev,
   libpng-dev | libpng12-dev,
-  libtiff5-dev | libtiff4-dev,
+  libtiff5-dev | libtiff-dev | libtiff4-dev,
   libmysqlclient-dev | libmysqlclient15-dev,
   libncurses5-dev,
   libpq-dev,

-- 
Geographic Resources Analysis Support System

___
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] grass branch, master, updated. upstream/6.4.1-123-g45a1edf

2013-09-11 Thread M. Hamish Bowman

The following commit has been merged in the master branch:
commit 45a1edfd95de061ec2df5cc21693297edbe7d5a8
Author: M. Hamish Bowman 
Date:   Wed Sep 11 21:05:55 2013 +1200

autoconf isn't run by rules, so patch configure too

diff --git a/debian/patches/svn-any-version b/debian/patches/svn-any-version
index 681675a..c37d578 100644
--- a/debian/patches/svn-any-version
+++ b/debian/patches/svn-any-version
@@ -11,3 +11,16 @@ Index: grass/configure.in
GRASS_VERSION_SVN=
 fi
  fi
+Index: grass/configure
+===
+--- grass.orig/configure
 grass/configure
+@@ -1313,7 +1313,7 @@ fi
+ 
+ if test "$SVN_VERSION" != "no" ; then
+GRASS_VERSION_SVN=`$SVN_VERSION -c | cut -f2 -d:`
+-   if test "$GRASS_VERSION_SVN" = "exported" ; then
++   if test "$GRASS_VERSION_SVN" = "exported" -o "$GRASS_VERSION_SVN" = 
"Unversioned directory" ; then
+   GRASS_VERSION_SVN=
+fi
+ fi

-- 
Geographic Resources Analysis Support System

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

42 matches

Mail list logo