This is an automated email from the git hooks/post-receive script. markus_wanner-guest pushed a commit to branch master in repository postgis.
commit c51136950a37f883bd4fd075176250d61c41cac1 Author: Markus Wanner <mar...@bluegap.ch> Date: Wed May 21 10:19:06 2014 +0200 Correct patch use-json-c. Drop explicit dependencies, but rely on shlibs:Depends, instead. Closes: #748332. Use urgency:high, again. --- debian/changelog | 9 +++++++-- debian/control | 2 +- debian/control.in | 2 +- debian/patches/use-json-c | 20 ++++++++++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 536c346..f4be84c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -postgis (2.1.3+dfsg-2) UNRELEASED; urgency=low +postgis (2.1.3+dfsg-2) UNRELEASED; urgency=high + [ Bas Couwenberg ] * Bump liblwgeom package name from 2.1.2 to 2.1.3. (closes: #748756) - -- Bas Couwenberg <sebas...@xs4all.nl> Wed, 21 May 2014 07:58:40 +0200 + [ Markus Wanner ] + * Correct patch use-json-c. Drop explicit dependencies, but rely on + shlibs:Depends, instead. Closes: #748332. + + -- Markus Wanner <mar...@bluegap.ch> Wed, 21 May 2014 10:15:57 +0200 postgis (2.1.3+dfsg-1) unstable; urgency=high diff --git a/debian/control b/debian/control index f29b3f4..ed4f318 100644 --- a/debian/control +++ b/debian/control @@ -74,7 +74,7 @@ Description: Geographic objects support for PostgreSQL -- JDBC support Package: liblwgeom-2.1.3 Architecture: any Section: libs -Depends: ${shlibs:Depends}, libjson0 (>= 0.9~), ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: PostGIS "Lightweight Geometry" library PostGIS adds support for geographic objects to the PostgreSQL object-relational database. In effect, PostGIS "spatially enables" diff --git a/debian/control.in b/debian/control.in index 59f4a70..bb755af 100644 --- a/debian/control.in +++ b/debian/control.in @@ -74,7 +74,7 @@ Description: Geographic objects support for PostgreSQL -- JDBC support Package: liblwgeom-2.1.3 Architecture: any Section: libs -Depends: ${shlibs:Depends}, libjson0 (>= 0.9~), ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: PostGIS "Lightweight Geometry" library PostGIS adds support for geographic objects to the PostgreSQL object-relational database. In effect, PostGIS "spatially enables" diff --git a/debian/patches/use-json-c b/debian/patches/use-json-c index 6598f45..0f44d67 100644 --- a/debian/patches/use-json-c +++ b/debian/patches/use-json-c @@ -136,3 +136,23 @@ Last-Update: 2013-05-12 /* Define to 1 if you have the `pq' library (-lpq). */ #undef HAVE_LIBPQ +--- a/postgis/lwgeom_in_geojson.c ++++ b/postgis/lwgeom_in_geojson.c +@@ -23,7 +23,7 @@ + PG_FUNCTION_INFO_V1(postgis_libjson_version); + Datum postgis_libjson_version(PG_FUNCTION_ARGS) + { +-#ifndef HAVE_LIBJSON ++#if !defined(HAVE_LIBJSON) && !defined(HAVE_LIBJSON_C) + PG_RETURN_NULL(); + #else /* HAVE_LIBJSON */ + const char *ver = "UNKNOWN"; +@@ -35,7 +35,7 @@ + PG_FUNCTION_INFO_V1(geom_from_geojson); + Datum geom_from_geojson(PG_FUNCTION_ARGS) + { +-#ifndef HAVE_LIBJSON ++#if !defined(HAVE_LIBJSON) && !defined(HAVE_LIBJSON_C) + elog(ERROR, "You need JSON-C for ST_GeomFromGeoJSON"); + PG_RETURN_NULL(); + #else /* HAVE_LIBJSON */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.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