[SCM] mapcache branch, master, updated. upstream/1.0.0-42-g33251a7

2013-07-19 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 33251a7c01f8c7f9c2fe8f66d26dca02576bd615
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jul 19 15:05:32 2013 +0200

Add mapcache.xml examples to libapache2-mod-mapcache.

diff --git a/debian/changelog b/debian/changelog
index 076329e..b104b0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low
   * Add patch to fix deletion of map tiles in seeder's delete mode.
   * Add watch file.
   * Add maintainer scripts for libmapcache0 to call ldconfig.
+  * Add mapcache.xml examples to libapache2-mod-mapcache.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sat, 15 Jun 2013 01:34:26 +0200
 
diff --git a/debian/libapache2-mod-mapcache.examples 
b/debian/libapache2-mod-mapcache.examples
new file mode 100644
index 000..83345be
--- /dev/null
+++ b/debian/libapache2-mod-mapcache.examples
@@ -0,0 +1,2 @@
+mapcache.xml
+mapcache.xml.sample

-- 
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-42-g33251a7

2013-07-19 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit f21b2bf63d461aebd1132a03d5df743d5b0eb646
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jul 19 14:12:47 2013 +0200

Improve package descriptions.

diff --git a/debian/control b/debian/control
index 6637524..c83b127 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,8 @@ Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: tile caching server - shared library
+ This package contains the shared library.
+ .
  MapCache is a server that implements tile caching to speed up access to WMS
  layers. The primary objectives are to be fast and easily deployable, while
  offering the essential features (and more!) expected from a tile caching
@@ -36,6 +38,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: mapcache-cgi, mapcache-tools, libapache2-mod-mapcache
 Description: tile caching server - shared library development files
+ This package contains the development files for the shared library.
+ .
  MapCache is a server that implements tile caching to speed up access to WMS
  layers. The primary objectives are to be fast and easily deployable, while
  offering the essential features (and more!) expected from a tile caching
@@ -46,6 +50,9 @@ Section: web
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: tile caching server - CGI binary
+ This package contains the mapcache FastCGI program, as alternative to the
+ Apache module available in libapache2-mod-mapcache.
+ .
  MapCache is a server that implements tile caching to speed up access to WMS
  layers. The primary objectives are to be fast and easily deployable, while
  offering the essential features (and more!) expected from a tile caching
@@ -56,6 +63,8 @@ Section: misc
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: tile caching server - tools
+ This package provides command-line utilities for MapCache.
+ .
  MapCache is a server that implements tile caching to speed up access to WMS
  layers. The primary objectives are to be fast and easily deployable, while
  offering the essential features (and more!) expected from a tile caching
@@ -67,6 +76,10 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  apache2-mpm-prefork | apache2-mpm-itk, apache2.2-common
 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
+ mapcache-cgi.
+ .
  MapCache is a server that implements tile caching to speed up access to WMS
  layers. The primary objectives are to be fast and easily deployable, while
  offering the essential features (and more!) expected from a tile caching

-- 
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-42-g33251a7

2013-07-19 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit d52f22c89c42ed3ab8feeae78dd2cfb162086737
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jul 19 14:02:21 2013 +0200

Add patch headers.

diff --git a/debian/patches/fixwithmapserv.patch 
b/debian/patches/fixwithmapserv.patch
index bb928b8..980f57e 100644
--- a/debian/patches/fixwithmapserv.patch
+++ b/debian/patches/fixwithmapserv.patch
@@ -1,3 +1,6 @@
+Description: Set path to libmapserver.la as installed by the mapserver package.
+Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
+Last-Update: 2013-06-12
 --- a/configure.in
 +++ b/configure.in
 @@ -484,7 +484,7 @@
diff --git a/debian/patches/includepath.patch b/debian/patches/includepath.patch
index 3b8063a..71924b3 100644
--- a/debian/patches/includepath.patch
+++ b/debian/patches/includepath.patch
@@ -1,3 +1,6 @@
+Description: Set include for mapserver.h as used by the mapserver package.
+Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
+Last-Update: 2013-06-12
 --- a/lib/source_mapserver.c
 +++ b/lib/source_mapserver.c
 @@ -38,7 +38,7 @@
diff --git a/debian/patches/libmapcache_hardening.patch 
b/debian/patches/libmapcache_hardening.patch
index 805d6f7..76ba3b6 100644
--- a/debian/patches/libmapcache_hardening.patch
+++ b/debian/patches/libmapcache_hardening.patch
@@ -1,3 +1,6 @@
+Description: Update Makefile to enable hardening build flags for libmapcache.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-06-21
 --- a/lib/Makefile.in
 +++ b/lib/Makefile.in
 @@ -17,7 +17,7 @@ source_mapserver.lo: source_mapserver.c

-- 
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-42-g33251a7

2013-07-19 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit f88e65bd3279690b2a05edc837d7112d25fc2f4c
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jul 19 14:13:12 2013 +0200

Update Homepage URL.

diff --git a/debian/control b/debian/control
index c83b127..d2b1f76 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), 
autotools-dev,
  autoconf, libfribidi-dev, libcairo2-dev, chrpath,
  docbook2x, docbook-xsl, docbook-xml, xsltproc
 Standards-Version: 3.9.4
-Homepage: http://mapserver.org/trunk/mapcache/
+Homepage: http://mapserver.org/en/mapcache/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapcache.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/mapcache.git
 

-- 
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-42-g33251a7

2013-07-19 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 3c99a2ef956c830e7a8963782225fd327542d069
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jul 19 14:45:05 2013 +0200

Add Bug URLs.

diff --git a/debian/patches/mapcache_seed_delete_mode.patch 
b/debian/patches/mapcache_seed_delete_mode.patch
index e9f4fa8..7cf5a05 100644
--- a/debian/patches/mapcache_seed_delete_mode.patch
+++ b/debian/patches/mapcache_seed_delete_mode.patch
@@ -1,5 +1,6 @@
 Description: Fix deletion of map tiles in seeder's delete mode
 Origin: 
https://github.com/mapserver/mapcache/commit/fde669fa6a9829afcb3d3be234abf38c1cf2aebe
+Bug: https://github.com/mapserver/mapcache/pull/78
 Last-Update: 2013-07-15
 --- a/util/mapcache_seed.c
 +++ b/util/mapcache_seed.c
diff --git a/debian/patches/mapcache_seed_non_zero_exit.patch 
b/debian/patches/mapcache_seed_non_zero_exit.patch
index 1728be0..77b4b59 100644
--- a/debian/patches/mapcache_seed_non_zero_exit.patch
+++ b/debian/patches/mapcache_seed_non_zero_exit.patch
@@ -1,5 +1,7 @@
 Description: Return non-zero exit status if errors occured.
 Origin: 
https://github.com/mapserver/mapcache/commit/fde669fa6a9829afcb3d3be234abf38c1cf2aeb
+Bug: https://github.com/mapserver/mapcache/issues/76
+Bug: https://github.com/mapserver/mapcache/pull/77
 Last-Update: 2013-07-11
 --- a/util/mapcache_seed.c
 +++ b/util/mapcache_seed.c

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