[mapcache] 01/02: Merge tag 'debian/1.4.1-2' into jessie-backports

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository mapcache.

commit 16277ee1672bc01137c3491653d07dfa0881d794
Merge: 2f9bf23 a824f98
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Mar 7 20:52:26 2016 +0100

    Merge tag 'debian/1.4.1-2' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 CMakeLists.txt                                   |  17 +-
 apache/mod_mapcache.c                            | 252 +++++++++++++++--------
 cgi/mapcache.c                                   |  14 +-
 cmake/FindAPACHE.cmake                           |   2 +-
 debian/changelog                                 |  39 ++++
 debian/control                                   |   7 +-
 debian/copyright                                 |   2 +-
 debian/libapache2-mod-mapcache.lintian-overrides |   3 +
 debian/libmapcache1.symbols                      |  15 +-
 debian/patches/across-typo.patch                 |  16 ++
 debian/patches/cmake-mapserver-include.patch     |   5 +-
 debian/patches/occurred-typo.patch               |  38 ++++
 debian/patches/overridden-typo.patch             |  16 ++
 debian/patches/series                            |   3 +
 debian/rules                                     |  11 +-
 debian/watch                                     |   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 +++++++++------
 43 files changed, 876 insertions(+), 521 deletions(-)

diff --cc debian/changelog
index c651b09,cccdc26..33e1bba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,42 +1,49 @@@
+ 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-4) unstable; urgency=medium
+ 
+   * Update watch file to use lowercase RC in uversionmangle.
+   * Rebuild for geos transition.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 29 Aug 2015 14:15:23 +0200
+ 
+ mapcache (1.4.0-3) unstable; urgency=medium
+ 
+   * Disable memcache support on architectures where it's not supported.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 25 Aug 2015 19:22:22 +0200
+ 
+ mapcache (1.4.0-2) unstable; urgency=medium
+ 
+   * Enable memcache support. Thanks to Frederic Junod for the patch.
+     (closes: 794784)
+   * Update Vcs-Browser URL to use HTTPS.
+   * Update Upstream-Contact in copyright file to include email address.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 25 Aug 2015 16:45:28 +0200
+ 
 +mapcache (1.4.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 06 Aug 2015 13:00:31 +0200
 +
  mapcache (1.4.0-1) unstable; urgency=medium
  
    * Update symbols for other architectures.
diff --cc debian/control
index f473774,2f9f52e..d656c29
--- a/debian/control
+++ b/debian/control
@@@ -35,9 -36,9 +36,9 @@@ Build-Depends: debhelper (>= 9)
                 docbook-xsl,
                 docbook-xml,
                 xsltproc
- Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/mapcache.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/mapcache.git -b jessie-backports
+ Standards-Version: 3.9.7
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mapcache.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapcache.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapcache.git -b jessie-backports
  Homepage: http://www.mapserver.org/mapcache/
  
  Package: libmapcache1

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