[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit aae31d6d17622a7b16dcac0f9771793b2c00f23a Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 04:11:58 2013 +0200 Fix hyphen-used-as-minus-sign in man pages by always marking options as such. diff --git

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 2b38b3133999e3b93f0ec24c8a545ae4816264b5 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 15:36:53 2013 +0200 Fix description section for sortshp. diff --git a/debian/man/sortshp.1.xml b/debian/man/sortshp.1.xml

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 1fe4653c6ecf090e18c094f9742c525f97245dfb Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 18:21:52 2013 +0200 Add lintian-overrides for php5-mapscript: unused-debconf-template, the maintainer scripts embed a

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit bb3dec6d26811859946186620f7217045ae28d17 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 19:31:18 2013 +0200 Use canonical URLs for Vcs-* fields. diff --git a/debian/control b/debian/control index bd427c2..67944ce

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit b8626c025eb465654c526cf4590e025171633524 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 16:54:06 2013 +0200 Add shp2img-typo.patch to fix a typo in the shp2img usage information. diff --git a/debian/changelog

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 5ce63b699614f2b498f573527907e8ad60733952 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 01:12:16 2013 +0200 Rename libmapserver package to libmapserver-6.2.1 to match SONAME. diff --git a/debian/changelog

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit fa7325e7a2258a68a0e048c8a60d825852bc Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 17:03:12 2013 +0200 Add headers for hardening.patch. diff --git a/debian/patches/hardening.patch

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 0646af8959e02fd7324e7bccd11dc80a13e31490 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 19:25:29 2013 +0200 Update mapscript suggests. diff --git a/debian/control b/debian/control index 7971d20..bd427c2 100644

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 56c64c9d99cf8bedd0464fe067cd42e634217eaf Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 17:20:52 2013 +0200 Add header for fixmapscriptvars.patch. diff --git a/debian/patches/fixmapscriptvars.patch

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit b75fd11750a190887e0ee8ef43eda9e6f78082cc Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 21:47:22 2013 +0200 Move libmapserver.so symlink to dev package. diff --git a/debian/libmapserver-6.2.1-dev.install

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 6e32b198916f7770c3514cec36918e813ce4a2fa Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 17:13:07 2013 +0200 Rename php_segfault to php_segfault.patch, and add header. diff --git a/debian/patches/php_segfault

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 85ee251cc1c04847e54de6aaeaa8ab6a52a27b7b Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 18:39:17 2013 +0200 Update libmapscript-ruby dependency to libmapscript-ruby1.9.1. diff --git a/debian/control

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 98645c78c9341ab0f0254eb0e4f9a50600365e72 Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Jul 15 21:05:34 2013 +0200 Bump Standards-Version to 3.9.4 (shared library changes). diff --git a/debian/changelog

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 9bf4fe3ef682f49dca44d28c910897db02dcabcf Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 22:13:24 2013 +0200 Have libmapserver-6.2.1-dev depend on same version of libmapserver-6.2.1. diff --git a/debian/control

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit ae37290497e01f3990df74b901b46529419808a4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Jul 17 11:25:27 2013 +0200 Update TODO.Debian to reflect current status. diff --git a/debian/TODO.Debian b/debian/TODO.Debian index

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 46813450a73f72ca04406b7c373f84009b7811c4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 14 19:08:25 2013 +0200 Improve description for Ruby mapscript packages. diff --git a/debian/control b/debian/control index

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 81541be46ffaac8aff6ec296f999461ddd06dc58 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Jul 17 11:07:38 2013 +0200 Remove README.etch, not longer relevant. diff --git a/debian/README.etch b/debian/README.etch deleted

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 5d4a2bb57448de3a48acd229e7e08f35dd7c602f Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Jul 16 19:21:23 2013 +0200 Enable hardening build flags for Ruby mapscript. diff --git a/debian/patches/hardening.patch

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit d33ca3e0e7cc99465a8af07242ce9cf7175003b8 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Jul 17 11:06:32 2013 +0200 Replace dpatch with quilt in README.source. diff --git a/debian/README.source b/debian/README.source

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit 257f52a037a19cc0800c3be18db575e27aae1ff2 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Jul 17 12:06:28 2013 +0200 Add maintainer scripts for libmapserver-6.2.1 to call ldconfig, don't call ldconfig for php5-mapscript.

[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a

2013-07-17 Thread Bas Couwenberg
The following commit has been merged in the master branch: commit daa718b5126c2feb17f9b63de5cee8a176aa4f4a Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Jul 17 11:23:33 2013 +0200 Drop README.Debian, no longer used for PHP mapscript. diff --git a/debian/README.Debian