[spatialite] 03/05: Merge branch 'master' into experimental

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository spatialite.

commit 39b687f7bc087c1d0c98043f6d18eed62f4da705
Merge: 7c7d03d 14e7178
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jan 12 21:36:06 2016 +0100

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog

 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index bb0215c,32708d2..8b26621
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,19 @@@
 +spatialite (4.4.0~rc0-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release candidate.
 +  * Drop patches, applied upstream.
 +  * Update copyright file, drop files section for asprintf4win.h.
 +  * Enable parallel builds, disable parallel test execution.
 +  * Update symbols for 4.4.0~rc0.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 15 Dec 2015 22:03:12 +0100
 +
+ spatialite (4.3.0a-4) unstable; urgency=medium
+ 
+   * Require at least liblwgeom-dev 2.2.1 for postgis mini-transition.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 12 Jan 2016 21:25:08 +0100
+ 
  spatialite (4.3.0a-3) unstable; urgency=medium
  
    * Add patch to switch from lw_vasprintf() to sqlite3_vmprintf().

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