[mapcache] 02/03: Merge tag 'debian/1.4.1-3' into ubuntu/trusty

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch ubuntu/trusty
in repository mapcache.

commit 43b5424e1a02d5e57ad89bd4c642d7751f7702d1
Merge: 62efbae 5862376
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Oct 27 12:54:54 2016 +0200

    Merge tag 'debian/1.4.1-3' into ubuntu/trusty
    
    Conflicts:
    	debian/changelog

 CMakeLists.txt                               |  17 +-
 apache/mod_mapcache.c                        | 252 +++++++++++++++++----------
 cgi/mapcache.c                               |  14 +-
 cmake/FindAPACHE.cmake                       |   2 +-
 debian/changelog                             |  25 +++
 debian/control                               |   4 +-
 debian/libmapcache1.postinst                 |  14 --
 debian/libmapcache1.postrm                   |  14 --
 debian/libmapcache1.symbols                  |  24 +--
 debian/patches/across-typo.patch             |  16 ++
 debian/patches/cmake-mapserver-include.patch |   2 +-
 debian/patches/occurred-typo.patch           |  38 ++++
 debian/patches/overridden-typo.patch         |  16 ++
 debian/patches/series                        |   3 +
 debian/rules                                 |   2 +-
 include/mapcache.h                           |  96 +++++-----
 include/util.h                               |   8 +-
 lib/cache_bdb.c                              |  51 +++---
 lib/cache_disk.c                             |  69 ++------
 lib/cache_fallback.c                         |   8 +-
 lib/cache_memcache.c                         |  15 +-
 lib/cache_multitier.c                        |   2 +-
 lib/cache_rest.c                             | 131 +++++++-------
 lib/cache_riak.c                             |  20 ++-
 lib/cache_sqlite.c                           |   6 +-
 lib/cache_tiff.c                             |  29 +--
 lib/connection_pool.c                        |   9 +-
 lib/core.c                                   |  28 +--
 lib/dimension.c                              |  49 ++++--
 lib/ezxml.c                                  |   2 +-
 lib/http.c                                   |   4 +-
 lib/image.c                                  |   8 +-
 lib/imageio_png.c                            |  18 +-
 lib/lock.c                                   |  25 ++-
 lib/service_demo.c                           |  23 +--
 lib/service_wms.c                            |  18 +-
 lib/service_wmts.c                           |   9 +-
 lib/strptime.c                               |   1 -
 lib/tileset.c                                |  42 ++---
 lib/util.c                                   |  69 +++++++-
 release.sh                                   |  54 ++++++
 util/mapcache_seed.c                         | 161 ++++++++++-------
 42 files changed, 845 insertions(+), 553 deletions(-)

diff --cc debian/changelog
index 86f7c6a,b70b43f..3685c34
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,28 +1,34 @@@
+ mapcache (1.4.1-3) unstable; urgency=medium
+ 
+   * Update symbols for hurd-i386.
+   * Bump Standards-Version to 3.9.8, no changes.
+   * Drop libmapcache2 post{inst,rm}, rely on dpkg-triggers for ldconfig.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 05 May 2016 11:40:45 +0200
+ 
+ mapcache (1.4.1-2) unstable; urgency=medium
+ 
+   * Disable memcache support on hurd-i386 too.
+   * Update symbols for other architectures.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 26 Feb 2016 09:46:50 +0100
+ 
+ mapcache (1.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update Vcs-Git URL to use HTTPS.
+   * Add patches for various typos.
+   * Bump Standards-Version to 3.9.7, no changes.
+   * Update symbols for 1.4.1.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 25 Feb 2016 21:04:46 +0100
+ 
 +mapcache (1.4.0-5~trusty0) trusty; urgency=medium
 +
 +  * No change rebuild for gdal 2.1.0 transition.
 +
 + -- Angelos Tzotsos <gcpp.kalxas at gmail.com>  Mon, 10 May 2016 03:51:00 +0200
 +
  mapcache (1.4.0-4) unstable; urgency=medium
  
    * Update watch file to use lowercase RC in uversionmangle.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcache.git