[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a
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 a/debian/man/legend.1.xml b/debian/man/legend.1.xml index c1f334c..e3aa39b 100644 --- a/debian/man/legend.1.xml +++ b/debian/man/legend.1.xml @@ -51,7 +51,7 @@ /varlistentry varlistentry -term-v/term +termoption-v/option/term listitem paraDisplay mapserver version and build options./para /listitem diff --git a/debian/man/mapserv.1.xml b/debian/man/mapserv.1.xml index e51c575..fcff007 100644 --- a/debian/man/mapserv.1.xml +++ b/debian/man/mapserv.1.xml @@ -79,7 +79,7 @@ informalexample para -To suppress the HTTP headers, you can use the -nh switch, such as: +To suppress the HTTP headers, you can use the option-nh/option switch, such as: /para screen diff --git a/debian/man/mapserver-config.1.xml b/debian/man/mapserver-config.1.xml index a75a8f4..ba6ef7c 100644 --- a/debian/man/mapserver-config.1.xml +++ b/debian/man/mapserver-config.1.xml @@ -15,12 +15,12 @@ refsynopsisdiv id='synopsis' cmdsynopsis commandmapserver-config/command - arg choice='opt'--libs/arg - arg choice='opt'--dep-libs/arg - arg choice='opt'--cflags/arg - arg choice='opt'--defines/arg - arg choice='opt'--includes/arg - arg choice='opt'--version/arg + arg choice='opt'option--libs/option/arg + arg choice='opt'option--dep-libs/option/arg + arg choice='opt'option--cflags/option/arg + arg choice='opt'option--defines/option/arg + arg choice='opt'option--includes/option/arg + arg choice='opt'option--version/option/arg /cmdsynopsis /refsynopsisdiv diff --git a/debian/man/msencrypt.1.xml b/debian/man/msencrypt.1.xml index f321f57..61f4d51 100644 --- a/debian/man/msencrypt.1.xml +++ b/debian/man/msencrypt.1.xml @@ -16,8 +16,8 @@ cmdsynopsis commandmsencrypt/command group -arg choice='plain'-keygen replaceablefile/replaceable/arg -arg choice='plain'-key replaceablefile/replaceable replaceablestring/replaceable/arg +arg choice='plain'option-keygen/option replaceablefile/replaceable/arg +arg choice='plain'option-key/option replaceablefile/replaceable replaceablestring/replaceable/arg /group /cmdsynopsis /refsynopsisdiv diff --git a/debian/man/scalebar.1.xml b/debian/man/scalebar.1.xml index 5202263..09c2f9b 100644 --- a/debian/man/scalebar.1.xml +++ b/debian/man/scalebar.1.xml @@ -19,7 +19,7 @@ arg choice='plain'replaceablemapfile/replaceable arg choice='plain'replaceableoutputimage/replaceable/arg /arg -arg choice='opt'-v/arg +arg choice='opt'option-v/option/arg /group /cmdsynopsis /refsynopsisdiv @@ -52,7 +52,7 @@ /varlistentry varlistentry -term-v/term +termoption-v/option/term listitem paraDisplay mapserver version and build options./para /listitem diff --git a/debian/man/shp2img.1.xml b/debian/man/shp2img.1.xml index c553339..b3d1459 100644 --- a/debian/man/shp2img.1.xml +++ b/debian/man/shp2img.1.xml @@ -15,18 +15,18 @@ refsynopsisdiv id='synopsis' cmdsynopsis commandshp2img/command - arg choice='plain'-m replaceablemapfile/replaceable/arg - arg choice='opt'-o replaceableimage/replaceable/arg - arg choice='opt'-e replaceableminx/replaceable replaceableminy/replaceable replaceablemaxx/replaceable replaceablemaxy/replaceable/arg - arg choice='opt'-s replaceablesizex/replaceable replaceablesizey/replaceable/arg - arg choice='opt'-l replaceablelayer1/replaceable arg choice='opt'replaceablelayer2/replaceable.../arg/arg - arg choice='opt'-i replaceableformat/replaceable/arg - arg choice='opt'-all_debug replaceablen/replaceable/arg - arg choice='opt'-map_debug replaceablen/replaceable/arg - arg choice='opt'-layer_debug replaceablelayername/replaceable replaceablen/replaceable/arg - arg choice='opt'-p replaceablen/replaceable/arg - arg choice='opt'-c replaceablen/replaceable/arg - arg choice='opt'-d replaceablelayername/replaceable replaceabledatavalue/replaceable/arg + arg choice='plain'option-m/option replaceablemapfile/replaceable/arg + arg choice='opt'option-o/option replaceableimage/replaceable/arg + arg choice='opt'option-e/option replaceableminx/replaceable replaceableminy/replaceable replaceablemaxx/replaceable replaceablemaxy/replaceable/arg + arg choice='opt'option-s/option replaceablesizex/replaceable replaceablesizey/replaceable/arg + arg choice='opt'option-l/option replaceablelayer1/replaceable arg choice='opt'replaceablelayer2/replaceable.../arg/arg + arg
[SCM] mapserver branch, master, updated. upstream/6.2.1-97-g257f52a
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 index 5ee1d5a..f3a7188 100644 --- a/debian/man/sortshp.1.xml +++ b/debian/man/sortshp.1.xml @@ -33,7 +33,15 @@ refsect1 id='description' titleDESCRIPTION/title para - commandsortshp/command displays an example. + commandsortshp/command sorts a Shape data set based on a single column + in ascending or descending order. Supports INTEGER, DOUBLE and STRING + column types. Useful for prioritizing shapes for rendering and/or labeling. +/para + +para + The idea here is that if you know that you need to display a certain + attribute classed by a certain value, it will be faster for MapServer to + access that value if it is at the beginning of the attribute file. /para /refsect1 -- 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-97-g257f52a
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 variable in the template name. diff --git a/debian/changelog b/debian/changelog index 7e16e83..e94b847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low * Rename libmapserver package to libmapserver-6.2.1 to match SONAME. * Add symbols file for libmapserver-6.2.1.so. * Add shp2img-typo.patch to fix a typo in the shp2img usage information. + * Add lintian-overrides for php5-mapscript: unused-debconf-template, +the maintainer scripts embed a variable in the template name. -- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Jun 2013 22:00:07 +0200 diff --git a/debian/php5-mapscript.lintian-overrides b/debian/php5-mapscript.lintian-overrides new file mode 100644 index 000..d0cce9d --- /dev/null +++ b/debian/php5-mapscript.lintian-overrides @@ -0,0 +1,3 @@ +# The maintainer scripts embed a variable in the template name +php5-mapscript: unused-debconf-template php5-mapscript/add_extension +php5-mapscript: unused-debconf-template php5-mapscript/remove_extension -- 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-97-g257f52a
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 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1),
libcurl4-gnutls-dev, li
docbook2x, docbook-xsl, docbook-xml, xsltproc
Build-Conflicts: libcurl3-openssl-dev
Homepage: http://www.mapserver.org
-Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git
-Vcs-Git: git://git.debian.org/git/pkg-grass/mapserver.git
+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}
--
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-97-g257f52a
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 b/debian/changelog index 5f9bdb8..7e16e83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low * Update copyright for v6.2.1. Convert to DEP5 format. * Rename libmapserver package to libmapserver-6.2.1 to match SONAME. * Add symbols file for libmapserver-6.2.1.so. + * Add shp2img-typo.patch to fix a typo in the shp2img usage information. -- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Jun 2013 22:00:07 +0200 diff --git a/debian/patches/series b/debian/patches/series index 8f58ad2..6624be5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ fixmapscriptvars.patch php_segfault mapows-contenttype.patch hardening.patch +shp2img-typo.patch diff --git a/debian/patches/shp2img-typo.patch b/debian/patches/shp2img-typo.patch new file mode 100644 index 000..7cfa6a2 --- /dev/null +++ b/debian/patches/shp2img-typo.patch @@ -0,0 +1,14 @@ +Description: Fix typo in usage information. +Author: Bas Couwenberg sebas...@xs4all.nl +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 ); -- 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-97-g257f52a
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 b/debian/changelog
index 26a0510..64c9f72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
- mapserv
- mapserver-config
* Update copyright for v6.2.1. Convert to DEP5 format.
+ * Rename libmapserver package to libmapserver-6.2.1 to match SONAME.
-- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Jun 2013 22:00:07 +0200
diff --git a/debian/control b/debian/control
index 196755e..f9b65c5 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,16 @@ Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git
Vcs-Git: git://git.debian.org/git/pkg-grass/mapserver.git
Package: libmapserver
+Depends: libmapserver-6.2.1, ${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.
+
+Package: libmapserver-6.2.1
+Replaces: libmapserver ( 6.2.1-3~)
+Breaks: libmapserver ( 6.2.1-3~)
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -31,12 +41,22 @@ Description: Shared library for MapServer
library packages.
Package: libmapserver-dev
+Depends: libmapserver-6.2.1-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.
+
+Package: libmapserver-6.2.1-dev
+Replaces: libmapserver-dev ( 6.2.1-3~)
+Breaks: libmapserver-dev ( 6.2.1-3~)
Section: libdevel
Architecture: any
Depends: ${misc:Depends}
Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
-Description: Shared library for MapServer
- This package contains the shared library.
+Description: Shared library development files for MapServer
+ This package contains the development files for the shared library.
.
MapServer is a CGI-based framework for Internet map services which
supports Open Geospatial Consortium (OGC) standards. Scripting
diff --git a/debian/libmapserver-dev.install
b/debian/libmapserver-6.2.1-dev.install
similarity index 100%
rename from debian/libmapserver-dev.install
rename to debian/libmapserver-6.2.1-dev.install
diff --git a/debian/libmapserver-dev.manpages
b/debian/libmapserver-6.2.1-dev.manpages
similarity index 100%
rename from debian/libmapserver-dev.manpages
rename to debian/libmapserver-6.2.1-dev.manpages
diff --git a/debian/libmapserver.install b/debian/libmapserver-6.2.1.install
similarity index 100%
rename from debian/libmapserver.install
rename to debian/libmapserver-6.2.1.install
--
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-97-g257f52a
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 b/debian/patches/hardening.patch index c7574e3..a4549df 100644 --- a/debian/patches/hardening.patch +++ b/debian/patches/hardening.patch @@ -1,3 +1,6 @@ +Description: Add support for hardening build flags. +Author: Bas Couwenberg sebas...@xs4all.nl +Last-Update: 2013-06-30 --- a/Makefile.in +++ b/Makefile.in @@ -254,6 +254,9 @@ FLAGS = @DEBUG_FLAGS@ $(DEFINES) $(INCLU -- 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-97-g257f52a
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
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,8 @@ Breaks: libmapserver ( 6.2.1-3~)
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
+Suggests: cgi-mapserver, mapserver-bin, mapserver-doc,
+ php5-mapscript, python-mapscript, libmapscript-perl, libmapscript-ruby
Description: Shared library for MapServer
This package contains the shared library.
.
@@ -54,7 +55,8 @@ Breaks: libmapserver-dev ( 6.2.1-3~)
Section: libdevel
Architecture: any
Depends: ${misc:Depends}
-Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
+Suggests: cgi-mapserver, mapserver-bin, mapserver-doc,
+ php5-mapscript, python-mapscript, libmapscript-perl, libmapscript-ruby
Description: Shared library development files for MapServer
This package contains the development files for the shared library.
.
@@ -70,6 +72,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: mapserver-bin, mapserver-doc
Description: php5-cgi module for MapServer
PHP MapScript provides MapServer functions for PHP scripts.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
Package: libmapscript-perl
Section: perl
@@ -81,12 +86,16 @@ Replaces: perl-mapscript
Conflicts: perl-mapscript
Description: Perl MapServer module
Perl MapScript module provides MapServer functions for Perl scripts.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
Package: cgi-mapserver
Section: web
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: mapserver-bin, mapserver-doc
+Suggests: mapserver-bin, mapserver-doc,
+ php5-mapscript, python-mapscript, libmapscript-perl, libmapscript-ruby
Description: CGI executable for MapServer
This package contains the mapserv CGI program. It provides the
MapServer template language, and can be used to implement Web Map
@@ -105,12 +114,16 @@ Suggests: mapserver-bin, mapserver-doc
Provides: ${python:Provides}
Description: Python library for MapServer
Python MapScript provides MapServer functions for Python scripts.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
Package: mapserver-bin
Section: misc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: perl-mapscript, python-mapscript, cgi-mapserver, mapserver-doc,
php5-mapscript, shapelib
+Suggests: cgi-mapserver, mapserver-doc, shapelib,
+ php5-mapscript, python-mapscript, libmapscript-perl, libmapscript-ruby
Description: MapServer utilities
This package provides command-line utilities for MapServer.
.
@@ -123,7 +136,8 @@ Package: mapserver-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Suggests: perl-mapscript, python-mapscript, php5-mapscript, cgi-mapserver
+Suggests: cgi-mapserver,
+ php5-mapscript, python-mapscript, libmapscript-perl, libmapscript-ruby
Description: documentation for MapServer
This package provides some brief documentation for MapServer.
.
--
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-97-g257f52a
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 b/debian/patches/fixmapscriptvars.patch index 03be76e..24d5ecd 100644 --- a/debian/patches/fixmapscriptvars.patch +++ b/debian/patches/fixmapscriptvars.patch @@ -1,3 +1,6 @@ +Description: Fix mapscriptvars to send the right argument to ld. +Author: Jerome Villeneuve Larouche jlarou...@mapgears.com +Last-Update: 2012-11-15 --- a/Makefile.in +++ b/Makefile.in @@ -415,7 +415,7 @@ mapscriptvars: Makefile -- 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-97-g257f52a
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 b/debian/libmapserver-6.2.1-dev.install index 942bdc2..073899d 100644 --- a/debian/libmapserver-6.2.1-dev.install +++ b/debian/libmapserver-6.2.1-dev.install @@ -1,3 +1,4 @@ usr/bin/mapserver-config usr/include/mapserver/* usr/lib/libmapserver.la +usr/lib/libmapserver.so diff --git a/debian/libmapserver-6.2.1.install b/debian/libmapserver-6.2.1.install index c5d9217..0c84993 100644 --- a/debian/libmapserver-6.2.1.install +++ b/debian/libmapserver-6.2.1.install @@ -1 +1 @@ -usr/lib/libmapserver*.so* +usr/lib/libmapserver-*.so -- 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-97-g257f52a
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 b/debian/patches/php_segfault.patch similarity index 60% rename from debian/patches/php_segfault rename to debian/patches/php_segfault.patch index 53c2b76..2f36265 100644 --- a/debian/patches/php_segfault +++ b/debian/patches/php_segfault.patch @@ -1,3 +1,7 @@ +Description: Fix segfault in ms_newMapObjFromString (PHP/MapScript). +Author: Alan Boudreault aboudrea...@mapgears.com +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 @@ diff --git a/debian/patches/series b/debian/patches/series index 6624be5..ee79e12 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ fixmapscriptvars.patch -php_segfault +php_segfault.patch mapows-contenttype.patch hardening.patch shp2img-typo.patch -- 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-97-g257f52a
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 b/debian/control
index f9b65c5..3cc8b3d 100644
--- a/debian/control
+++ b/debian/control
@@ -135,7 +135,7 @@ Description: documentation for MapServer
Package: libmapscript-ruby
Section: ruby
Architecture: all
-Depends: libmapscript-ruby1.8, ${misc:Depends}
+Depends: libmapscript-ruby1.9.1, ${misc:Depends}
Description: Ruby MapServer library
Ruby MapScript provides MapServer functions for Ruby scripts.
.
--
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-97-g257f52a
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 b/debian/changelog index e94b847..96fb3d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low * Add shp2img-typo.patch to fix a typo in the shp2img usage information. * Add lintian-overrides for php5-mapscript: unused-debconf-template, the maintainer scripts embed a variable in the template name. + * Bump Standards-Version to 3.9.4 (shared library changes). -- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Jun 2013 22:00:07 +0200 diff --git a/debian/control b/debian/control index e39eb80..cc0c386 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault aboudrea...@mapgears.com -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (= 1.1.4), libgd-dev (= 2.1.0~rc1-2), libfreetype6-dev (= 2.0.9), libjpeg-dev, libgdal1-dev (=1.9.0), libproj-dev, libpq-dev, php5-dev, swig, python-all (= 2.6.6-3~), python-all-dev (= 2.6.6-3~), libgeos-dev (= 3.3.1-1~), -- 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-97-g257f52a
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 b/debian/control
index 67944ce..e39eb80 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,7 @@ Replaces: libmapserver-dev ( 6.2.1-3~)
Breaks: libmapserver-dev ( 6.2.1-3~)
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}
+Depends: libmapserver-6.2.1 (=${binary:Version}), ${misc:Depends}
Suggests: cgi-mapserver, mapserver-bin, mapserver-doc,
php5-mapscript, python-mapscript, libmapscript-perl, libmapscript-ruby
Description: Shared library development files for MapServer
--
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-97-g257f52a
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 34aad2a..249cf62 100644 --- a/debian/TODO.Debian +++ b/debian/TODO.Debian @@ -2,5 +2,3 @@ Debian mapserver TODO list -- - Include some more bindings when someone requests them. -- Rename perl-mapscript to libmapscript-perl. I suppose that by renaming - perl-mapscript we should also rename python-mapscript and php5-mapscript. diff --git a/debian/changelog b/debian/changelog index 9033300..c9c0ccc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low * Replace dpatch with quilt in README.source. * Drop README.etch, no longer relevant. * Drop README.Debian, no longer used for PHP mapscript. + * Update TODO.Debian to reflect current status. -- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Jun 2013 22:00:07 +0200 -- 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-97-g257f52a
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 3cc8b3d..7971d20 100644
--- a/debian/control
+++ b/debian/control
@@ -136,24 +136,37 @@ Package: libmapscript-ruby
Section: ruby
Architecture: all
Depends: libmapscript-ruby1.9.1, ${misc:Depends}
-Description: Ruby MapServer library
+Description: MapServer library for Ruby
Ruby MapScript provides MapServer functions for Ruby scripts.
.
This package contains examples and depends on package for Debian
default version of Ruby.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
Package: libmapscript-ruby1.8
Section: ruby
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: mapserver-bin, mapserver-doc
-Description: Ruby MapServer library
+Description: MapServer library for Ruby 1.8
Ruby MapScript provides MapServer functions for Ruby scripts.
+ .
+ This package contains the MapServer functions for Ruby 1.8.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
Package: libmapscript-ruby1.9.1
Section: ruby
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: mapserver-bin, mapserver-doc
-Description: Ruby MapServer library
+Description: MapServer library for Ruby 1.9.1
Ruby MapScript provides MapServer functions for Ruby scripts.
+ .
+ This package contains the MapServer functions for Ruby 1.9.1.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
--
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-97-g257f52a
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 file mode 100644 index 97e55ef..000 --- a/debian/README.etch +++ /dev/null @@ -1,7 +0,0 @@ -Note for packagers --- - -Starting from =4.10.2-1 a separate tree is maintained for Etch compatibility -in order to develop both a clean sid tree and a backporting tree. In practice, -the etch tree retains PHP4 compatibility, which is instead dropped in lenny, -due to PHP4 removal. diff --git a/debian/TODO.Debian b/debian/TODO.Debian index 307a589..34aad2a 100644 --- a/debian/TODO.Debian +++ b/debian/TODO.Debian @@ -3,4 +3,4 @@ Debian mapserver TODO list - Include some more bindings when someone requests them. - Rename perl-mapscript to libmapscript-perl. I suppose that by renaming - perl-mapscript we should also rename python-mapscript and php5-mapscript. \ No newline at end of file + perl-mapscript we should also rename python-mapscript and php5-mapscript. diff --git a/debian/changelog b/debian/changelog index 935bda4..aa794a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low the maintainer scripts embed a variable in the template name. * Bump Standards-Version to 3.9.4 (shared library changes). * Replace dpatch with quilt in README.source. + * Drop README.etch, no longer relevant. -- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Jun 2013 22:00:07 +0200 -- 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-97-g257f52a
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 b/debian/patches/hardening.patch
index a4549df..c5ffdf6 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -88,3 +88,14 @@ Last-Update: 2013-06-30
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
+
+ # $CFLAGS works only with 1.8 ??? - the -Wall argument is not needed !!!
+ $CFLAGS =
+-$CPPFLAGS = make_inc + -idirafter $(rubylibdir)/$(arch) + make_define
++$CPPFLAGS += make_inc + -idirafter $(rubylibdir)/$(arch) + make_define
+ $LDFLAGS += -fPIC -Wl,-rpath,#{MAPSERVER_LOCAL_LIBS}
+ #$LOCAL_LIBS += -L../../.libs/ + -lmapserver + make_static_libs
+ $LOCAL_LIBS += -L#{MAPSERVER_LOCAL_LIBS} + -lmapserver
diff --git a/debian/rules b/debian/rules
index a501885..bf1fa1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
CFLAGS+=$(CPPFLAGS)
CFLAGS+=$(LDFLAGS)
+
+# mapscript.so for ruby1.9.1 fails to build with -Werror=format-security
+RUBY_CPPFLAGS=$(subst -Werror=format-security,,$(CFLAGS))
package=mapserver
@@ -105,7 +108,7 @@ build-arch-stamp: configure-stamp
# Build ruby
cd $(CURDIR)/mapscript/ruby set -e ; \
for v in $(RUBYVERS) ; do \
- ruby$$v extconf.rb $(MAKE) \
+ ruby$$v extconf.rb --with-cppflags=$(RUBY_CPPFLAGS) $(MAKE)
\
mv mapscript.so ruby$$v-mapscript.so ; \
done
@@ -182,7 +185,7 @@ install-arch-stamp: build-arch
# Ruby mapscript
cd $(CURDIR)/mapscript/ruby set -e ; \
for v in $(RUBYVERS) ; do \
- ruby$$v extconf.rb ; \
+ ruby$$v extconf.rb --with-cppflags=$(RUBY_CPPFLAGS) ; \
$(MAKE) install
sitedir=$(CURDIR)/debian/libmapscript-ruby$$v/usr/lib/ruby ; \
$(MAKE) distclean ; \
done
--
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-97-g257f52a
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 index 481ab55..1e667c5 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,10 +1,10 @@ Mapserver for Debian -This package uses dpatch to manage all modifications to the upstream +This package uses quilt to manage all modifications to the upstream source. Changes are stored in the source package as diffs in debian/patches and applied during the build. To get detailed instructions on how to apply the series of patches -and modify them, please read /usr/share/doc/dpatch/README.source. +and modify them, please read /usr/share/doc/quilt/README.source. diff --git a/debian/changelog b/debian/changelog index 96fb3d8..935bda4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low * Add lintian-overrides for php5-mapscript: unused-debconf-template, the maintainer scripts embed a variable in the template name. * Bump Standards-Version to 3.9.4 (shared library changes). + * Replace dpatch with quilt in README.source. -- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Jun 2013 22:00:07 +0200 -- 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-97-g257f52a
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. diff --git a/debian/changelog b/debian/changelog index c9c0ccc..85984c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,8 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low * Drop README.etch, no longer relevant. * Drop README.Debian, no longer used for PHP mapscript. * Update TODO.Debian to reflect current status. + * Add maintainer scripts for libmapserver-6.2.1 to call ldconfig, +don't call ldconfig for php5-mapscript. -- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Jun 2013 22:00:07 +0200 diff --git a/debian/libmapserver-6.2.1.postinst b/debian/libmapserver-6.2.1.postinst new file mode 100644 index 000..786d689 --- /dev/null +++ b/debian/libmapserver-6.2.1.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +#DEBHELPER# + +exit 0 diff --git a/debian/libmapserver-6.2.1.postrm b/debian/libmapserver-6.2.1.postrm new file mode 100644 index 000..786d689 --- /dev/null +++ b/debian/libmapserver-6.2.1.postrm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index bf1fa1e..68b765f 100755 --- a/debian/rules +++ b/debian/rules @@ -248,7 +248,7 @@ binary-arch: install-arch dh_lintian -a dh_strip -a dh_fixperms -a - dh_makeshlibs -a + dh_makeshlibs -a -Xphp_mapscript dh_installdeb -a dh_shlibdeps -a dh_perl -plibmapscript-perl -- 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-97-g257f52a
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 b/debian/README.Debian deleted file mode 100644 index 1e715c4..000 --- a/debian/README.Debian +++ /dev/null @@ -1,9 +0,0 @@ -README for mapserver's debian package -= - -This build of mapscript PHP extension can't be load as a 'cgi-fcgi' module for -stability reason, but only with PHP as an apache DSO. If you need the cgi-fcgi -support, feel free to build your own package but note that according upstream -it will not be stable. - - -- Fabio Tranchitella kob...@debian.org Sun, 24 Jun 2007 11:44:44 +0200 diff --git a/debian/changelog b/debian/changelog index aa794a7..9033300 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low * Bump Standards-Version to 3.9.4 (shared library changes). * Replace dpatch with quilt in README.source. * Drop README.etch, no longer relevant. + * Drop README.Debian, no longer used for PHP mapscript. -- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Jun 2013 22:00:07 +0200 -- 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
