This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository spatialite.
commit 757107b08388f911def19e62a479f2bcc920f84a Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Thu Aug 27 18:16:39 2015 +0200 Reinstate liblwgeom-dev (build) dependency. Revert "Drop build dependency on liblwgeom-dev to untangle spatialite->postgis->gdal->spatialite circular dependency." This reverts commit d6ebe18671958f6d0993312688d8840ec67c4d7f. Conflicts: debian/changelog --- debian/changelog | 6 ++++++ debian/control | 1 + debian/libspatialite7.symbols | 48 +++++++++++++++++++++---------------------- debian/rules | 2 +- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index a36a920..5948f70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spatialite (4.3.0-3) UNRELEASED; urgency=medium + + * Reinstate liblwgeom-dev (build) dependency. + + -- Bas Couwenberg <sebas...@debian.org> Thu, 27 Aug 2015 18:15:40 +0200 + spatialite (4.3.0-2) unstable; urgency=medium * Drop build dependency on liblwgeom-dev to untangle diff --git a/debian/control b/debian/control index af3d436..7159f9c 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9), libreadline-dev, libexpat1-dev, libfreexl-dev, + liblwgeom-dev, libxml2-dev, pkg-config, zlib1g-dev diff --git a/debian/libspatialite7.symbols b/debian/libspatialite7.symbols index d9f55e6..fda52c6 100644 --- a/debian/libspatialite7.symbols +++ b/debian/libspatialite7.symbols @@ -178,8 +178,8 @@ libspatialite.so.7 libspatialite7 #MINVER# ewktParseFree@Base 3.0.0 ewkt_point_xyzm@Base 3.0.0 ewky_yylex@Base 4.0.0 -#MISSING: 4.3.0# gaia3DDistance@Base 4.3.0~rc0 -#MISSING: 4.3.0# gaia3DMaxDistance@Base 4.3.0~rc0 + gaia3DDistance@Base 4.3.0~rc0 + gaia3DMaxDistance@Base 4.3.0~rc0 gaiaAddControlPoint2D@Base 4.3.0~rc0 gaiaAddControlPoint3D@Base 4.3.0~rc0 gaiaAddDbfField@Base 2.4.0 @@ -221,8 +221,8 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaAppendPointZMToDynamicLine@Base 3.0.0 gaiaAppendPointZToDynamicLine@Base 3.0.0 gaiaAppendToOutBuffer@Base 3.0.0 -#MISSING: 4.3.0# gaiaAsX3D@Base 4.3.0~rc0 -#MISSING: 4.3.0# gaiaAzimuth@Base 4.3.0~rc0 + gaiaAsX3D@Base 4.3.0~rc0 + gaiaAzimuth@Base 4.3.0~rc0 gaiaBoundary@Base 2.4.0 gaiaBoundary_r@Base 4.2.0 gaiaBuildCircleMbr@Base 2.4.0 @@ -307,7 +307,7 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaDynamicLineSplitAfter@Base 2.4.0 gaiaDynamicLineSplitBefore@Base 2.4.0 gaiaEllipseParams@Base 2.4.0 -#MISSING: 4.3.0# gaiaEllipsoidAzimuth@Base 4.3.0~rc0 + gaiaEllipsoidAzimuth@Base 4.3.0~rc0 gaiaEncodeURL@Base 4.3.0~rc0 gaiaEndianArch@Base 2.4.0 gaiaEwkbGetLinestring@Base 4.0.0 @@ -382,8 +382,8 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaFromWkb@Base 2.4.0 gaiaFullFileNameFromPath@Base 4.3.0~rc0 gaiaGPKG2Spatialite@Base 4.2.0 -#MISSING: 4.3.0# gaiaGeoHash@Base 4.3.0~rc0 -#MISSING: 4.3.0# gaiaGeodesicArea@Base 4.3.0~rc0 + gaiaGeoHash@Base 4.3.0~rc0 + gaiaGeodesicArea@Base 4.3.0~rc0 gaiaGeodesicDistance@Base 2.4.0 gaiaGeodesicTotalLength@Base 2.4.0 gaiaGeomCollArea@Base 2.4.0 @@ -461,8 +461,8 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaGetGpsLatLong@Base 2.4.0 gaiaGetLayerExtent@Base 4.1.0 gaiaGetLocaleCharset@Base 2.4.0 -#MISSING: 4.3.0# gaiaGetLwGeomErrorMsg@Base 4.3.0~rc0 -#MISSING: 4.3.0# gaiaGetLwGeomWarningMsg@Base 4.3.0~rc0 + gaiaGetLwGeomErrorMsg@Base 4.3.0~rc0 + gaiaGetLwGeomWarningMsg@Base 4.3.0~rc0 gaiaGetMbrMaxX@Base 2.4.0 gaiaGetMbrMaxY@Base 2.4.0 gaiaGetMbrMinX@Base 2.4.0 @@ -557,9 +557,9 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaMakePointZ@Base 3.0.2~20120302 gaiaMakePointZM@Base 3.0.2~20120302 gaiaMakePolygon@Base 4.2.0 -#MISSING: 4.3.0# gaiaMakeValid@Base 4.3.0~rc0 -#MISSING: 4.3.0# gaiaMakeValidDiscarded@Base 4.3.0~rc0 -#MISSING: 4.3.0# gaiaMaxDistance@Base 4.3.0~rc0 + gaiaMakeValid@Base 4.3.0~rc0 + gaiaMakeValidDiscarded@Base 4.3.0~rc0 + gaiaMaxDistance@Base 4.3.0~rc0 gaiaMbrGeometry@Base 2.4.0 gaiaMbrLinestring@Base 2.4.0 gaiaMbrPolygon@Base 2.4.0 @@ -576,7 +576,7 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaMergeGeometries@Base 3.0.0 gaiaMergeGeometries_r@Base 4.2.0 gaiaMinDistance@Base 2.4.0 -#MISSING: 4.3.0# gaiaNodeLines@Base 4.3.0~rc0 + gaiaNodeLines@Base 4.3.0~rc0 gaiaNormalizeLonLat@Base 4.0.0 gaiaOffsetCurve@Base 3.0.2~20120302 gaiaOffsetCurve_r@Base 4.2.0 @@ -625,7 +625,7 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaPrependPointToDynamicLine@Base 2.4.0 gaiaPrependPointZMToDynamicLine@Base 3.0.0 gaiaPrependPointZToDynamicLine@Base 3.0.0 -#MISSING: 4.3.0# gaiaProjectedPoint@Base 4.3.0~rc0 + gaiaProjectedPoint@Base 4.3.0~rc0 gaiaQuotedSql@Base 3.0.2~20120302 gaiaRadsToDegs@Base 2.4.0 gaiaReadDbfEntity@Base 2.4.0 @@ -636,7 +636,7 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaResetDbfEntity@Base 2.4.0 gaiaResetGeosMsg@Base 2.4.0 gaiaResetGeosMsg_r@Base 4.2.0 -#MISSING: 4.3.0# gaiaResetLwGeomMsg@Base 4.3.0~rc0 + gaiaResetLwGeomMsg@Base 4.3.0~rc0 gaiaReverseDynamicLine@Base 2.4.0 gaiaRingCentroid@Base 2.4.0 gaiaRingGetPoint@Base 2.4.0 @@ -644,7 +644,7 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaRotateCoords@Base 2.4.0 gaiaSanitize@Base 2.4.0 gaiaScaleCoords@Base 2.4.0 -#MISSING: 4.3.0# gaiaSegmentize@Base 4.3.0~rc0 + gaiaSegmentize@Base 4.3.0~rc0 gaiaSetDoubleValue@Base 2.4.0 gaiaSetGeosAuxErrorMsg@Base 4.1.0 gaiaSetGeosAuxErrorMsg_r@Base 4.2.0 @@ -653,8 +653,8 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaSetGeosWarningMsg@Base 2.4.0 gaiaSetGeosWarningMsg_r@Base 4.2.0 gaiaSetIntValue@Base 2.4.0 -#MISSING: 4.3.0# gaiaSetLwGeomErrorMsg@Base 4.3.0~rc0 -#MISSING: 4.3.0# gaiaSetLwGeomWarningMsg@Base 4.3.0~rc0 + gaiaSetLwGeomErrorMsg@Base 4.3.0~rc0 + gaiaSetLwGeomWarningMsg@Base 4.3.0~rc0 gaiaSetNullValue@Base 2.4.0 gaiaSetStrValue@Base 2.4.0 gaiaSharedPaths@Base 3.0.2~20120302 @@ -672,9 +672,9 @@ libspatialite.so.7 libspatialite7 #MINVER# gaiaSnapToGrid@Base 4.0.0 gaiaSnap_r@Base 4.2.0 gaiaSpatialite2GPKG@Base 4.2.0 -#MISSING: 4.3.0# gaiaSplit@Base 4.3.0~rc0 -#MISSING: 4.3.0# gaiaSplitLeft@Base 4.3.0~rc0 -#MISSING: 4.3.0# gaiaSplitRight@Base 4.3.0~rc0 + gaiaSplit@Base 4.3.0~rc0 + gaiaSplitLeft@Base 4.3.0~rc0 + gaiaSplitRight@Base 4.3.0~rc0 gaiaSquareGrid@Base 4.0.0 gaiaSquareGrid_r@Base 4.2.0 gaiaStatisticsInvalidate@Base 4.2.0 @@ -745,8 +745,8 @@ libspatialite.so.7 libspatialite7 #MINVER# gaia_geos_warning_msg@Base 2.4.0 gaia_geosaux_error_msg@Base 4.1.0 gaia_libxml2_version@Base 4.1.1 -#MISSING: 4.3.0# gaia_lwgeom_error_msg@Base 4.3.0~rc0 -#MISSING: 4.3.0# gaia_lwgeom_warning_msg@Base 4.3.0~rc0 + gaia_lwgeom_error_msg@Base 4.3.0~rc0 + gaia_lwgeom_warning_msg@Base 4.3.0~rc0 gaia_matrix_as_text@Base 4.3.0~rc0 gaia_matrix_create@Base 4.3.0~rc0 gaia_matrix_create_multiply@Base 4.3.0~rc0 @@ -823,7 +823,7 @@ libspatialite.so.7 libspatialite7 #MINVER# spatialitetargetcpu@Base 4.2.0 spatialiteversion@Base 2.4.0 splite_connection_pool@Base 4.2.0 -#MISSING: 4.3.0# splitelwgeomversion@Base 4.3.0~rc0 + splitelwgeomversion@Base 4.3.0~rc0 srid_get_axis@Base 4.3.0~rc0 srid_get_datum@Base 4.3.0~rc0 srid_get_prime_meridian@Base 4.3.0~rc0 diff --git a/debian/rules b/debian/rules index 9858508..e440d21 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ override_dh_auto_configure: --enable-geos \ $(EPSG) \ --enable-proj \ - --enable-lwgeom=no \ + --enable-lwgeom=yes \ --enable-gcp=yes \ --disable-examples -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel