[SCM] mapcache branch, master, updated. upstream/1.0.0-48-ga2a666f
The following commit has been merged in the master branch: commit 7f470fec9f904d1b982b2fe4ee9b4f40683cc8b1 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jul 21 20:28:11 2013 +0200 Better grouping of Build-Depends. diff --git a/debian/control b/debian/control index 1f81fb1..6e8b91c 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), autotools-dev, apache2-prefork-dev, libfcgi-dev, libpcre3-dev, libpixman-1-dev, libsqlite3-dev, libtiff4-dev, - libmapserver-6.2.1, libmapserver-6.2.1-dev, dh-autoreconf, - autoconf, chrpath, + libmapserver-6.2.1, libmapserver-6.2.1-dev, + autoconf, dh-autoreconf, chrpath, docbook2x, docbook-xsl, docbook-xml, xsltproc Standards-Version: 3.9.4 Homepage: http://mapserver.org/en/mapcache/ -- 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-48-ga2a666f
The following commit has been merged in the master branch:
commit 16ca3a833a6d04c8eb1ce4de050767422c1d57a7
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Tue Jul 23 11:01:21 2013 +0200
Update for apache 2.4.
diff --git a/debian/changelog b/debian/changelog
index b104b0e..f294604 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low
* Add watch file.
* Add maintainer scripts for libmapcache0 to call ldconfig.
* Add mapcache.xml examples to libapache2-mod-mapcache.
+ * Update for apache 2.4.
-- Bas Couwenberg sebas...@xs4all.nl Sat, 15 Jun 2013 01:34:26 +0200
diff --git a/debian/control b/debian/control
index 6e8b91c..c8eaced 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1),
autotools-dev,
libgd-dev (= 2.1.0~rc1-2), libfreetype6-dev (= 2.0.9),
libgdal1-dev (=1.9.0), libproj-dev, libgeos-dev (= 3.3.1-1~),
libfribidi-dev, libcairo2-dev,
- apache2-prefork-dev, libfcgi-dev,
+ apache2-dev, dh-apache2, libfcgi-dev,
libpcre3-dev, libpixman-1-dev,
libsqlite3-dev, libtiff4-dev,
libmapserver-6.2.1, libmapserver-6.2.1-dev,
@@ -77,8 +77,7 @@ Description: tile caching server - tools
Package: libapache2-mod-mapcache
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- apache2-mpm-prefork | apache2-mpm-itk, apache2.2-common
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: tile caching server - Apache module
This is the MapCache module for the Apache web server implementing OGC web
services. An alternative mapcache FastCGI program is available in
diff --git a/debian/libapache2-mod-mapcache.apache2
b/debian/libapache2-mod-mapcache.apache2
new file mode 100644
index 000..f9a1d2f
--- /dev/null
+++ b/debian/libapache2-mod-mapcache.apache2
@@ -0,0 +1,2 @@
+mod apache/.libs/mod_mapcache.so
+mod debian/mapcache.load
diff --git a/debian/libapache2-mod-mapcache.postinst
b/debian/libapache2-mod-mapcache.postinst
index 6fe5969..2c37b9e 100644
--- a/debian/libapache2-mod-mapcache.postinst
+++ b/debian/libapache2-mod-mapcache.postinst
@@ -9,11 +9,10 @@ if [ $1 = configure ] ; then
# only enable on new installs, not on upgrades
if [ -z $2 ] ; then
- a2enmod -q mapcache
- fi
- # only restart if mod_something is enabled
- if [ -e /etc/apache2/mods-enabled/mapcache.load ] ; then
- invoke-rc.d apache2 restart
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke enmod mapcache
+ fi
fi
fi
diff --git a/debian/libapache2-mod-mapcache.prerm
b/debian/libapache2-mod-mapcache.prerm
index 35cfdc0..e7a4c99 100644
--- a/debian/libapache2-mod-mapcache.prerm
+++ b/debian/libapache2-mod-mapcache.prerm
@@ -3,8 +3,10 @@
set -e
if [ $1 = remove ] ; then
- a2dismod -q -f mapcache || true
- invoke-rc.d apache2 restart
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke dismod mapcache
+ fi
fi
#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index c90f35e..5b2fad3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ CFLAGS+=$(CPPFLAGS)
CFLAGS+=$(LDFLAGS)
%:
- dh $@ --with autoreconf
+ dh $@ --with autoreconf,apache2
override_dh_clean:
dh_clean
--
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-48-ga2a666f
The following commit has been merged in the master branch:
commit c8f6f71187de3b123772f2b1a2067b956dc2da01
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Tue Jul 23 11:25:41 2013 +0200
Refresh patches.
diff --git a/debian/patches/mapcache_seed_delete_mode.patch
b/debian/patches/mapcache_seed_delete_mode.patch
index 7cf5a05..f578720 100644
--- a/debian/patches/mapcache_seed_delete_mode.patch
+++ b/debian/patches/mapcache_seed_delete_mode.patch
@@ -4,7 +4,7 @@ Bug: https://github.com/mapserver/mapcache/pull/78
Last-Update: 2013-07-15
--- a/util/mapcache_seed.c
+++ b/util/mapcache_seed.c
-@@ -569,7 +569,7 @@ void cmd_worker()
+@@ -561,7 +561,7 @@ void cmd_worker()
tile-z = z;
action = examine_tile(cmd_ctx, tile);
diff --git a/debian/patches/mapcache_seed_non_zero_exit.patch
b/debian/patches/mapcache_seed_non_zero_exit.patch
index 77b4b59..cf64e69 100644
--- a/debian/patches/mapcache_seed_non_zero_exit.patch
+++ b/debian/patches/mapcache_seed_non_zero_exit.patch
@@ -5,7 +5,7 @@ Bug: https://github.com/mapserver/mapcache/pull/77
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)
+@@ -940,7 +940,9 @@ int main(int argc, const char **argv)
}
}
if((nClippers=OGR_L_GetFeatureCount(layer, TRUE)) == 0) {
@@ -16,7 +16,7 @@ Last-Update: 2013-07-11
}
-@@ -1248,6 +1250,11 @@ int main(int argc, const char **argv)
+@@ -1190,6 +1192,11 @@ int main(int argc, const char **argv)
printf(\nseeded %d metatiles at %g tiles/sec\n,seededtilestot,
seededtilestot/duration);
}
apr_terminate();
--
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-48-ga2a666f
The following commit has been merged in the master branch:
commit a2a666f430de489ca1170d9a68742a0a862bb044
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Tue Jul 23 11:55:09 2013 +0200
Add patch to fix typos in mapcache_seed.
diff --git a/debian/changelog b/debian/changelog
index f294604..72d4398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low
* 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 patch to fix typos in mapcache_seed.
* Add watch file.
* Add maintainer scripts for libmapcache0 to call ldconfig.
* Add mapcache.xml examples to libapache2-mod-mapcache.
diff --git a/debian/patches/mapcache_seed_typo.patch
b/debian/patches/mapcache_seed_typo.patch
new file mode 100644
index 000..5f9a4c8
--- /dev/null
+++ b/debian/patches/mapcache_seed_typo.patch
@@ -0,0 +1,19 @@
+Description: Fix typo in mapcache_seed utility.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-07-23
+--- a/util/mapcache_seed.c
b/util/mapcache_seed.c
+@@ -1034,11 +1034,11 @@ int main(int argc, const char **argv)
+
+ if (mode == MAPCACHE_CMD_TRANSFER) {
+ if (!tileset_transfer_name)
+- return usage(argv[0],tileset where tiles should be transfered to not
specified);
++ return usage(argv[0],tileset where tiles should be transferred to not
specified);
+
+ tileset_transfer =
mapcache_configuration_get_tileset(cfg,tileset_transfer_name);
+ if(!tileset_transfer)
+- return usage(argv[0], tileset where tiles should be transfered to not
found in configuration);
++ return usage(argv[0], tileset where tiles should be transferred to not
found in configuration);
+ }
+
+ if(old) {
diff --git a/debian/patches/series b/debian/patches/series
index 7387d1a..e29bae7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ demo_service_page_height.patch
demo_service_indenting.patch
mapcache_seed_non_zero_exit.patch
mapcache_seed_delete_mode.patch
+mapcache_seed_typo.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
