[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, 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, 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
