Processing of doris_4.06~beta2+dfsg-2_amd64.changes
doris_4.06~beta2+dfsg-2_amd64.changes uploaded successfully to localhost along with the files: doris_4.06~beta2+dfsg-2.dsc doris_4.06~beta2+dfsg-2.debian.tar.gz doris_4.06~beta2+dfsg-2_amd64.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
doris_4.06~beta2+dfsg-2_amd64.changes REJECTED
doris_4.06~beta2+dfsg-2.dsc: Invalid size hash for doris_4.06~beta2+dfsg.orig.tar.gz: According to the control file the size hash should be 617849, but doris_4.06~beta2+dfsg.orig.tar.gz has 591943. If you did not include doris_4.06~beta2+dfsg.orig.tar.gz in you upload, a different version might already be known to the archive software. === 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
Re: Bug report on gpx2shp: gpx2shp crashes with exit status 139
Hello again, Great to hear. I just wrapped up the source and uploaded it to Debian. :) Thanks to update. I just sync debian directory in my SVN. I cannot follow bug reports at the package well, please let me know when something happened on it. Thanks always, Toshi. Petter Reinholdtsen p...@hungry.comさん: [HIRAOKA, Toshihiro] Hello Petter, Hi. :) Very glad to see a new release so quickly. :) I just released the new version 0.70 that fixed many bugs the you told me and I found by testing over 3000 gpx files from OSM. Great to hear. I just wrapped up the source and uploaded it to Debian. :) I think it's stable enough now. Could you check the release? The only issue I had was with the conflicting debian/ directory. I replaced it with the one we keep in svn, and uploaded using our version. -- Happy hacking Petter Reinholdtsen HIRAOKA, Toshihiro AzukiMap K.K. 6F 3-12-4 Uchi-Kanda, Chiyoda-ku, Tokyo, JAPAN 101-0047 e-mail: hira...@azukimap.jp ___ 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 doris_4.06~beta2+dfsg-2_amd64.changes
doris_4.06~beta2+dfsg-2_amd64.changes uploaded successfully to localhost along with the files: doris_4.06~beta2+dfsg-2.dsc doris_4.06~beta2+dfsg-2.debian.tar.gz doris_4.06~beta2+dfsg-2_amd64.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
doris_4.06~beta2+dfsg-2_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Sun, 30 Jun 2013 18:36:35 + Source: doris Binary: doris Architecture: source amd64 Version: 4.06~beta2+dfsg-2 Distribution: unstable Urgency: low Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Antonio Valentino antonio.valent...@tiscali.it Description: doris - Delft object-oriented radar interferometric software Changes: doris (4.06~beta2+dfsg-2) unstable; urgency=low . * Use canonical URLs in VSC fields * The watch file has been updated * Fixed missing call do dh_python2 in debian/rules (also added build dependency from python-all) * Fixed copyright format URL * Fix unnecessarily versioned dependencies Checksums-Sha1: aa8907cd1765a47b11f0e24ff070599fbb80e34a 1414 doris_4.06~beta2+dfsg-2.dsc 843cc33ded09c7ffe970a85690c874140690988f 12179 doris_4.06~beta2+dfsg-2.debian.tar.gz cce951b9e6bca20778624c3ad5cdefe05f401099 806858 doris_4.06~beta2+dfsg-2_amd64.deb Checksums-Sha256: b9883b243cd559b9414bfc688b1305b160a0538a0867e934cab34f6415cd68df 1414 doris_4.06~beta2+dfsg-2.dsc 9e01c14602382c3ebd29b46eaa824c14f84d74b79f48e7802d5a0531ea506ac5 12179 doris_4.06~beta2+dfsg-2.debian.tar.gz cc0a7d3dc7371d637ca8369038d5832c80b415e3e036782461d8a7968e793c9d 806858 doris_4.06~beta2+dfsg-2_amd64.deb Files: b80a3cd1f429be62d1de96ba4c39fe3d 1414 contrib/science optional doris_4.06~beta2+dfsg-2.dsc cfb7711bce9cc4a3154318ae1af0b349 12179 contrib/science optional doris_4.06~beta2+dfsg-2.debian.tar.gz 9aabb9912a6cf78ec8831070395438f3 806858 contrib/science optional doris_4.06~beta2+dfsg-2_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlHmw14ACgkQpFNRmenyx0eeNgCg6I/iqRrwddjwFpdCaxSr3Gfu XPoAoOXZ8MJJf9J0chqPydSoynQWOEr7 =zj1Q -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] saga branch, master, updated. f345cec412fc86b5b57ebaf5a8c2810f86c35da2
The following commit has been merged in the master branch: commit f345cec412fc86b5b57ebaf5a8c2810f86c35da2 Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Wed Jul 17 14:25:50 2013 -0400 Update changelog diff --git a/debian/changelog b/debian/changelog index f9794fc..ba4e2e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +saga (2.0.8+dfsg-4) UNRELEASED; urgency=low + + * Correct saga-depends + * Add Missing Depends to libsaga-dev. Fixes #715109 + + -- Johan Van de Wauw johan.vandew...@gmail.com Wed, 17 Jul 2013 13:58:31 -0400 + saga (2.0.8+dfsg-3) unstable; urgency=low * Removed libvigraimpex-dev b-d. -- Saga GIS ___ 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] saga branch, master, updated. f345cec412fc86b5b57ebaf5a8c2810f86c35da2
The following commit has been merged in the master branch: commit bf869bcef4bea6d88f1acb964e67fb930580745e Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Wed Jul 17 13:56:49 2013 -0400 Add Missing Depends to libsaga-dev. Fixes #715109 diff --git a/debian/control b/debian/control index 5d4dd9e..bf66eba 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Package: libsaga-dev Section: libdevel Architecture: any Suggests: saga (= ${binary:Version}) -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libsaga (= ${binary:Version}) Replaces: libsaga ( 2.0.4+dfsg-3~) Breaks: libsaga ( 2.0.4+dfsg-3~) Description: SAGA GIS development files -- Saga GIS ___ 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] saga branch, master, updated. f345cec412fc86b5b57ebaf5a8c2810f86c35da2
The following commit has been merged in the master branch: commit ca28819f0c4057a0064a1faf72362215984269ac Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Wed Jul 17 13:48:02 2013 -0400 Correct saga-depends diff --git a/debian/saga-depends b/debian/saga-depends index 9e62a02..f0a490b 100644 --- a/debian/saga-depends +++ b/debian/saga-depends @@ -8,11 +8,11 @@ if [ $# -ne 0 ]; then cat debian/${PKG}.substvars EOF -saga:Depends=libsaga-2.0.6 +saga:Depends=libsaga-2.0.8 EOF else cat debian/substvars EOF -saga:Depends=libsaga-2.0.6 +saga:Depends=libsaga-2.0.8 EOF fi -- Saga GIS ___ 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] saga annotated tag, upstream/2.0.7, created. upstream/2.0.7
The annotated tag, upstream/2.0.7 has been created at c8991105ede5fe379545d9d63ff17b3c84d10d91 (tag) tagging 8b0c2788e3b1ed7cfba5875072a130a73cbaa126 (commit) tagged by Johan Van de Wauw on Fri Jun 3 04:10:29 2011 -0400 - Shortlog Upstream version 2.0.7 Johan Van de Wauw (6): Imported Upstream version 2.0.4 New upstream version 2.0.5 Remove non-free components and copy of g2clib Imported Upstream version 2.0.6 Imported Upstream version 2.0.6+dfsg Imported Upstream version 2.0.7 --- -- Saga GIS ___ 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] saga tag, debian/2.0.8+dfsg-3, created. upstream/2.0.8-119-g864c173
The tag, debian/2.0.8+dfsg-3 has been created at 864c173c2549f6935fbf86cfffee7279856671aa (commit) - Shortlog commit 864c173c2549f6935fbf86cfffee7279856671aa Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Jun 18 14:30:50 2012 +0200 Fixed #669468 --- -- Saga GIS ___ 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] saga annotated tag, upstream/2.0.8, created. upstream/2.0.8
The annotated tag, upstream/2.0.8 has been created at 319680669b87e929f355d63ac2d824c4b183b0d9 (tag) tagging 4d56ecce013704bf00c8355fbeb443512fad5d12 (commit) replaces upstream/2.0.7 tagged by Johan Van de Wauw on Wed Sep 14 01:39:40 2011 -0400 - Shortlog Upstream version 2.0.8 Johan Van de Wauw (2): Imported Upstream version 2.0.7+dfsg Imported Upstream version 2.0.8 --- -- Saga GIS ___ 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] saga branch, master, updated. upstream/2.0.8-123-gdd522f0
The following commit has been merged in the master branch: commit dd522f08aa6a04efc150d14d098a9652879a5b66 Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Wed Jul 17 14:29:53 2013 -0400 Set distribution correct in changelog diff --git a/debian/changelog b/debian/changelog index ba4e2e5..a521a1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -saga (2.0.8+dfsg-4) UNRELEASED; urgency=low +saga (2.0.8+dfsg-4) unstable; urgency=low * Correct saga-depends * Add Missing Depends to libsaga-dev. Fixes #715109 -- Saga GIS ___ 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] saga tag, debian/2.0.8+dfsg-4, created. upstream/2.0.8-123-gdd522f0
The tag, debian/2.0.8+dfsg-4 has been created at dd522f08aa6a04efc150d14d098a9652879a5b66 (commit) - Shortlog commit dd522f08aa6a04efc150d14d098a9652879a5b66 Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Wed Jul 17 14:29:53 2013 -0400 Set distribution correct in changelog --- -- Saga GIS ___ 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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, jessie, updated. upstream/6.2.1-97-g257f52a
The following commit has been merged in the jessie 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
[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
[SCM] mapcache branch, jessie, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the jessie branch: commit ff9c5c3f95096382e67796b4ad72eb0bcb7cd7b4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:00:10 2013 +0200 Add maintainer scripts for libmapcache0 to call ldconfig. diff --git a/debian/changelog b/debian/changelog index 73d2490..b174640 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low * Add patch to set the page height to 100% for the demo service. * Add patch to use 4 space indenting in the generated HTML. * Add watch file. + * Add maintainer scripts for libmapcache0 to call ldconfig. -- Bas Couwenberg sebas...@xs4all.nl Sat, 15 Jun 2013 01:34:26 +0200 diff --git a/debian/libmapcache0.postinst b/debian/libmapcache0.postinst new file mode 100644 index 000..786d689 --- /dev/null +++ b/debian/libmapcache0.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +#DEBHELPER# + +exit 0 diff --git a/debian/libmapcache0.postrm b/debian/libmapcache0.postrm new file mode 100644 index 000..786d689 --- /dev/null +++ b/debian/libmapcache0.postrm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +#DEBHELPER# + +exit 0 -- 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] mapcache branch, jessie, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the jessie branch: commit e85b7b2915236b6a0cad8120a72c7631c52d27d1 Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:03:40 2013 +0200 Add patch to return non-zero exit status if errors occured in mapcache_seed. diff --git a/debian/changelog b/debian/changelog index b174640..2e23626 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low * Add patch to add newlines after each list item. * Add patch to set the page height to 100% for the demo service. * Add patch to use 4 space indenting in the generated HTML. + * Add patch to return non-zero exit status if errors occured in mapcache_seed. * Add watch file. * Add maintainer scripts for libmapcache0 to call ldconfig. diff --git a/debian/patches/mapcache_seed_non_zero_exit.patch b/debian/patches/mapcache_seed_non_zero_exit.patch new file mode 100644 index 000..1728be0 --- /dev/null +++ b/debian/patches/mapcache_seed_non_zero_exit.patch @@ -0,0 +1,28 @@ +Description: Return non-zero exit status if errors occured. +Origin: https://github.com/mapserver/mapcache/commit/fde669fa6a9829afcb3d3be234abf38c1cf2aeb +Last-Update: 2013-07-11 +--- a/util/mapcache_seed.c b/util/mapcache_seed.c +@@ -963,7 +963,9 @@ int main(int argc, const char **argv) + } + } + if((nClippers=OGR_L_GetFeatureCount(layer, TRUE)) == 0) { +- return usage(argv[0],no features in provided ogr parameters, cannot continue); ++ printf(no features in provided ogr parameters, cannot continue\n); ++ apr_terminate(); ++ exit(0); + } + + +@@ -1248,6 +1250,11 @@ int main(int argc, const char **argv) + printf(\nseeded %d metatiles at %g tiles/sec\n,seededtilestot, seededtilestot/duration); + } + apr_terminate(); ++ ++ if (error_detected 0) { ++exit(1); ++ } ++ + return 0; + } + /* vim: ts=2 sts=2 et sw=2 diff --git a/debian/patches/series b/debian/patches/series index a5aeb20..3a9d9be 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ demo_service_html_charset.patch demo_service_list_newlines.patch demo_service_page_height.patch demo_service_indenting.patch +mapcache_seed_non_zero_exit.patch -- 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] mapcache branch, master, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the master branch: commit e85b7b2915236b6a0cad8120a72c7631c52d27d1 Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:03:40 2013 +0200 Add patch to return non-zero exit status if errors occured in mapcache_seed. diff --git a/debian/changelog b/debian/changelog index b174640..2e23626 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low * Add patch to add newlines after each list item. * Add patch to set the page height to 100% for the demo service. * Add patch to use 4 space indenting in the generated HTML. + * Add patch to return non-zero exit status if errors occured in mapcache_seed. * Add watch file. * Add maintainer scripts for libmapcache0 to call ldconfig. diff --git a/debian/patches/mapcache_seed_non_zero_exit.patch b/debian/patches/mapcache_seed_non_zero_exit.patch new file mode 100644 index 000..1728be0 --- /dev/null +++ b/debian/patches/mapcache_seed_non_zero_exit.patch @@ -0,0 +1,28 @@ +Description: Return non-zero exit status if errors occured. +Origin: https://github.com/mapserver/mapcache/commit/fde669fa6a9829afcb3d3be234abf38c1cf2aeb +Last-Update: 2013-07-11 +--- a/util/mapcache_seed.c b/util/mapcache_seed.c +@@ -963,7 +963,9 @@ int main(int argc, const char **argv) + } + } + if((nClippers=OGR_L_GetFeatureCount(layer, TRUE)) == 0) { +- return usage(argv[0],no features in provided ogr parameters, cannot continue); ++ printf(no features in provided ogr parameters, cannot continue\n); ++ apr_terminate(); ++ exit(0); + } + + +@@ -1248,6 +1250,11 @@ int main(int argc, const char **argv) + printf(\nseeded %d metatiles at %g tiles/sec\n,seededtilestot, seededtilestot/duration); + } + apr_terminate(); ++ ++ if (error_detected 0) { ++exit(1); ++ } ++ + return 0; + } + /* vim: ts=2 sts=2 et sw=2 diff --git a/debian/patches/series b/debian/patches/series index a5aeb20..3a9d9be 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ demo_service_html_charset.patch demo_service_list_newlines.patch demo_service_page_height.patch demo_service_indenting.patch +mapcache_seed_non_zero_exit.patch -- 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] mapcache branch, master, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the master branch: commit 99117066044b8d579074e7dc11152b89a189e2b4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:05:49 2013 +0200 Fix hyphen-used-as-minus-sign in man page by always marking options as such. diff --git a/debian/mapcache_seed.1.xml b/debian/mapcache_seed.1.xml index a3d92b3..8ea4512 100644 --- a/debian/mapcache_seed.1.xml +++ b/debian/mapcache_seed.1.xml @@ -12,11 +12,10 @@ refpurposegenerate tiles to seed mapcache/refpurpose /refnamediv - !-- body begins here -- refsynopsisdiv id='synopsis' cmdsynopsis commandmapcache_seed/command - arg choice='plain'-c replaceable/path/to/mapcache.xml/replaceable/arg + arg choice='plain'option-c/option replaceable/path/to/mapcache.xml/replaceable/arg arg choice='opt'replaceableoptions/replaceable/arg /cmdsynopsis /refsynopsisdiv @@ -107,7 +106,8 @@ tiles from the WMS source. The default is 1, but can be set higher if the WMS server can withstand parallel requests (as a rule of thumb, the value chosen here should never be much higher than the number -of cpus on the WMS server). (Incompatible with -p/--nprocesses). +of cpus on the WMS server). (Incompatible with +option-p/option/option--nprocesses/option). /para /listitem /varlistentry @@ -118,7 +118,8 @@ listitem para Number of parallel processes that should be used to request -tiles from the WMS source. (Incompatible with -n/--nthreads). +tiles from the WMS source. (Incompatible with +option-n/option/option--nthreads/option). /para /listitem /varlistentry @@ -146,7 +147,8 @@ para Used to specify which dimension to use if the tileset supports dimensions. Can be used multiple times to set multiple -dimensions, e.g. -D DIM1=VAL1 -D DIM2=VAL2. +dimensions, e.g. option-D/option DIM1=VAL1 +option-D/option DIM2=VAL2. /para /listitem /varlistentry -- 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] mapcache branch, master, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the master branch: commit ff9c5c3f95096382e67796b4ad72eb0bcb7cd7b4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:00:10 2013 +0200 Add maintainer scripts for libmapcache0 to call ldconfig. diff --git a/debian/changelog b/debian/changelog index 73d2490..b174640 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low * Add patch to set the page height to 100% for the demo service. * Add patch to use 4 space indenting in the generated HTML. * Add watch file. + * Add maintainer scripts for libmapcache0 to call ldconfig. -- Bas Couwenberg sebas...@xs4all.nl Sat, 15 Jun 2013 01:34:26 +0200 diff --git a/debian/libmapcache0.postinst b/debian/libmapcache0.postinst new file mode 100644 index 000..786d689 --- /dev/null +++ b/debian/libmapcache0.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +#DEBHELPER# + +exit 0 diff --git a/debian/libmapcache0.postrm b/debian/libmapcache0.postrm new file mode 100644 index 000..786d689 --- /dev/null +++ b/debian/libmapcache0.postrm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +#DEBHELPER# + +exit 0 -- 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] mapcache branch, jessie, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the jessie branch: commit 99117066044b8d579074e7dc11152b89a189e2b4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:05:49 2013 +0200 Fix hyphen-used-as-minus-sign in man page by always marking options as such. diff --git a/debian/mapcache_seed.1.xml b/debian/mapcache_seed.1.xml index a3d92b3..8ea4512 100644 --- a/debian/mapcache_seed.1.xml +++ b/debian/mapcache_seed.1.xml @@ -12,11 +12,10 @@ refpurposegenerate tiles to seed mapcache/refpurpose /refnamediv - !-- body begins here -- refsynopsisdiv id='synopsis' cmdsynopsis commandmapcache_seed/command - arg choice='plain'-c replaceable/path/to/mapcache.xml/replaceable/arg + arg choice='plain'option-c/option replaceable/path/to/mapcache.xml/replaceable/arg arg choice='opt'replaceableoptions/replaceable/arg /cmdsynopsis /refsynopsisdiv @@ -107,7 +106,8 @@ tiles from the WMS source. The default is 1, but can be set higher if the WMS server can withstand parallel requests (as a rule of thumb, the value chosen here should never be much higher than the number -of cpus on the WMS server). (Incompatible with -p/--nprocesses). +of cpus on the WMS server). (Incompatible with +option-p/option/option--nprocesses/option). /para /listitem /varlistentry @@ -118,7 +118,8 @@ listitem para Number of parallel processes that should be used to request -tiles from the WMS source. (Incompatible with -n/--nthreads). +tiles from the WMS source. (Incompatible with +option-n/option/option--nthreads/option). /para /listitem /varlistentry @@ -146,7 +147,8 @@ para Used to specify which dimension to use if the tileset supports dimensions. Can be used multiple times to set multiple -dimensions, e.g. -D DIM1=VAL1 -D DIM2=VAL2. +dimensions, e.g. option-D/option DIM1=VAL1 +option-D/option DIM2=VAL2. /para /listitem /varlistentry -- 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] mapcache branch, master, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the master branch: commit 85262246085c525b7b058ff1747365d0a88a351d Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:00:59 2013 +0200 Drop template README. diff --git a/debian/README b/debian/README deleted file mode 100644 index 372d63a..000 --- a/debian/README +++ /dev/null @@ -1,6 +0,0 @@ -The Debian Package mapcache - - -Comments regarding the Package - - -- Tom Payne tom.pa...@camptocamp.com Thu, 07 Jun 2012 19:30:39 +0200 -- 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] mapcache branch, master, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the master branch: commit 3ced07baaea13d8d07ae74b3c6c7d99b3f10453d Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:05:04 2013 +0200 Update libmapserver Build-Depends. diff --git a/debian/control b/debian/control index 985a427..6637524 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault abou Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), autotools-dev, apache2-prefork-dev, libpng-dev, libjpeg-dev, libcurl4-gnutls-dev, libpcre3-dev, libpixman-1-dev, libfcgi-dev, libgdal1-dev, libgeos-dev, - libsqlite3-dev, libtiff4-dev, libmapserver, libmapserver-dev, + libsqlite3-dev, libtiff4-dev, libmapserver-6.2.1, libmapserver-6.2.1-dev, libgd-dev (= 2.1.0~rc1-2), libproj-dev, autoconf, libfribidi-dev, libcairo2-dev, chrpath, docbook2x, docbook-xsl, docbook-xml, xsltproc -- 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] mapcache branch, master, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the master branch: commit 678c17e824ace68f8677b3f73906be298b1f2e82 Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:04:20 2013 +0200 Add patch to fix deletion of map tiles in seeder's delete mode. diff --git a/debian/changelog b/debian/changelog index 2e23626..076329e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low * Add patch to set the page height to 100% for the demo service. * Add patch to use 4 space indenting in the generated HTML. * Add patch to return non-zero exit status if errors occured in mapcache_seed. + * Add patch to fix deletion of map tiles in seeder's delete mode. * Add watch file. * Add maintainer scripts for libmapcache0 to call ldconfig. diff --git a/debian/patches/mapcache_seed_delete_mode.patch b/debian/patches/mapcache_seed_delete_mode.patch new file mode 100644 index 000..e9f4fa8 --- /dev/null +++ b/debian/patches/mapcache_seed_delete_mode.patch @@ -0,0 +1,14 @@ +Description: Fix deletion of map tiles in seeder's delete mode +Origin: https://github.com/mapserver/mapcache/commit/fde669fa6a9829afcb3d3be234abf38c1cf2aebe +Last-Update: 2013-07-15 +--- a/util/mapcache_seed.c b/util/mapcache_seed.c +@@ -569,7 +569,7 @@ void cmd_worker() + tile-z = z; + action = examine_tile(cmd_ctx, tile); + +- if(action == MAPCACHE_CMD_SEED || action == MAPCACHE_CMD_TRANSFER) { ++ if(action == MAPCACHE_CMD_SEED || action == MAPCACHE_CMD_DELETE || action == MAPCACHE_CMD_TRANSFER) { + //current x,y,z needs seeding, add it to the queue + struct seed_cmd cmd; + cmd.x = x; diff --git a/debian/patches/series b/debian/patches/series index 3a9d9be..7387d1a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ demo_service_list_newlines.patch demo_service_page_height.patch demo_service_indenting.patch mapcache_seed_non_zero_exit.patch +mapcache_seed_delete_mode.patch -- 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] mapcache branch, jessie, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the jessie branch: commit 3ced07baaea13d8d07ae74b3c6c7d99b3f10453d Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:05:04 2013 +0200 Update libmapserver Build-Depends. diff --git a/debian/control b/debian/control index 985a427..6637524 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault abou Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), autotools-dev, apache2-prefork-dev, libpng-dev, libjpeg-dev, libcurl4-gnutls-dev, libpcre3-dev, libpixman-1-dev, libfcgi-dev, libgdal1-dev, libgeos-dev, - libsqlite3-dev, libtiff4-dev, libmapserver, libmapserver-dev, + libsqlite3-dev, libtiff4-dev, libmapserver-6.2.1, libmapserver-6.2.1-dev, libgd-dev (= 2.1.0~rc1-2), libproj-dev, autoconf, libfribidi-dev, libcairo2-dev, chrpath, docbook2x, docbook-xsl, docbook-xml, xsltproc -- 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] mapcache branch, jessie, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the jessie branch: commit 678c17e824ace68f8677b3f73906be298b1f2e82 Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:04:20 2013 +0200 Add patch to fix deletion of map tiles in seeder's delete mode. diff --git a/debian/changelog b/debian/changelog index 2e23626..076329e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low * Add patch to set the page height to 100% for the demo service. * Add patch to use 4 space indenting in the generated HTML. * Add patch to return non-zero exit status if errors occured in mapcache_seed. + * Add patch to fix deletion of map tiles in seeder's delete mode. * Add watch file. * Add maintainer scripts for libmapcache0 to call ldconfig. diff --git a/debian/patches/mapcache_seed_delete_mode.patch b/debian/patches/mapcache_seed_delete_mode.patch new file mode 100644 index 000..e9f4fa8 --- /dev/null +++ b/debian/patches/mapcache_seed_delete_mode.patch @@ -0,0 +1,14 @@ +Description: Fix deletion of map tiles in seeder's delete mode +Origin: https://github.com/mapserver/mapcache/commit/fde669fa6a9829afcb3d3be234abf38c1cf2aebe +Last-Update: 2013-07-15 +--- a/util/mapcache_seed.c b/util/mapcache_seed.c +@@ -569,7 +569,7 @@ void cmd_worker() + tile-z = z; + action = examine_tile(cmd_ctx, tile); + +- if(action == MAPCACHE_CMD_SEED || action == MAPCACHE_CMD_TRANSFER) { ++ if(action == MAPCACHE_CMD_SEED || action == MAPCACHE_CMD_DELETE || action == MAPCACHE_CMD_TRANSFER) { + //current x,y,z needs seeding, add it to the queue + struct seed_cmd cmd; + cmd.x = x; diff --git a/debian/patches/series b/debian/patches/series index 3a9d9be..7387d1a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ demo_service_list_newlines.patch demo_service_page_height.patch demo_service_indenting.patch mapcache_seed_non_zero_exit.patch +mapcache_seed_delete_mode.patch -- 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] mapcache branch, jessie, updated. upstream/1.0.0-37-g9911706
The following commit has been merged in the jessie branch: commit 85262246085c525b7b058ff1747365d0a88a351d Author: Bas Couwenberg sebas...@xs4all.nl Date: Thu Jul 18 00:00:59 2013 +0200 Drop template README. diff --git a/debian/README b/debian/README deleted file mode 100644 index 372d63a..000 --- a/debian/README +++ /dev/null @@ -1,6 +0,0 @@ -The Debian Package mapcache - - -Comments regarding the Package - - -- Tom Payne tom.pa...@camptocamp.com Thu, 07 Jun 2012 19:30:39 +0200 -- 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
Re: Bug report on gpx2shp: gpx2shp crashes with exit status 139
Did you consider subscribing to the package? The interface on URL: http://packages.qa.debian.org/common/index.html allow you to get an email every time something happen with the gpx2shp package. I see. I did. Thank you. Petter Reinholdtsen p...@hungry.comさん: [Toshihiro HIRAOKA] I cannot follow bug reports at the package well, please let me know when something happened on it. Did you consider subscribing to the package? The interface on URL: http://packages.qa.debian.org/common/index.html allow you to get an email every time something happen with the gpx2shp package. -- Happy hacking Petter Reinholdtsen HIRAOKA, Toshihiro AzukiMap K.K. 6F 3-12-4 Uchi-Kanda, Chiyoda-ku, Tokyo, JAPAN 101-0047 e-mail: hira...@azukimap.jp ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel