This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository postgis.
commit e7fa6df74cf38cd4e831841c9758904352e742ae Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Aug 8 21:39:58 2014 +0200 Refresh patches. --- debian/patches/honor-build-flags | 8 ++++---- debian/patches/use-json-c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/patches/honor-build-flags b/debian/patches/honor-build-flags index b5d12a5..f5e950e 100644 --- a/debian/patches/honor-build-flags +++ b/debian/patches/honor-build-flags @@ -8,7 +8,7 @@ Last-Update: 2013-04-23 --- a/loader/Makefile.in +++ b/loader/Makefile.in -@@ -97,11 +97,11 @@ +@@ -97,11 +97,11 @@ pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2s $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM) $(LIBTOOL) --mode=link \ @@ -22,7 +22,7 @@ Last-Update: 2013-04-23 shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c -@@ -109,7 +109,7 @@ +@@ -109,7 +109,7 @@ shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgs $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES) $(LIBTOOL) --mode=link \ $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \ @@ -41,7 +41,7 @@ Last-Update: 2013-04-23 CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@ LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@ NUMERICFLAGS = @NUMERICFLAGS@ -@@ -153,10 +154,10 @@ +@@ -153,10 +154,10 @@ check: liblwgeom.la # Command to build each of the .lo files $(LT_SA_OBJS): %.lo: %.c @@ -56,7 +56,7 @@ Last-Update: 2013-04-23 # Bison 2.5, Flex 2.5.35 --- a/configure +++ b/configure -@@ -19752,7 +19752,7 @@ +@@ -19752,7 +19752,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF diff --git a/debian/patches/use-json-c b/debian/patches/use-json-c index 0f44d67..9e86f23 100644 --- a/debian/patches/use-json-c +++ b/debian/patches/use-json-c @@ -9,7 +9,7 @@ Last-Update: 2013-05-12 --- a/configure.ac +++ b/configure.ac -@@ -113,9 +113,9 @@ +@@ -113,9 +113,9 @@ dnl dnl Check for platform-specific functions dnl AC_CHECK_FUNC(vasprintf, [HAVE_VASPRINTF=1], [HAVE_VASPRINTF=0]) @@ -21,7 +21,7 @@ Last-Update: 2013-05-12 AC_FUNC_FSEEKO() dnl -@@ -751,6 +751,7 @@ +@@ -751,6 +751,7 @@ dnl ==================================== CHECK_JSON=yes HAVE_JSON=no @@ -29,7 +29,7 @@ Last-Update: 2013-05-12 AC_ARG_WITH([json], [AS_HELP_STRING([--without-json], [build without json-c support])], -@@ -788,14 +789,14 @@ +@@ -788,14 +789,14 @@ fi dnl Check that we can find the json/json.h header file CPPFLAGS_SAVE="$CPPFLAGS" CPPFLAGS="$JSON_CPPFLAGS" @@ -46,7 +46,7 @@ Last-Update: 2013-05-12 AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson"], [], []) ], []) LIBS="$LIBS_SAVE" -@@ -804,9 +805,14 @@ +@@ -804,9 +805,14 @@ if test "$HAVE_JSON" = "yes"; then AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present]) fi @@ -80,7 +80,7 @@ Last-Update: 2013-05-12 #include <string.h> static void geojson_lwerror(char *msg, int error_code) -@@ -489,11 +494,11 @@ +@@ -489,11 +494,11 @@ parse_geojson(json_object *geojson, int LWGEOM* lwgeom_from_geojson(const char *geojson, char **srs) { @@ -94,7 +94,7 @@ Last-Update: 2013-05-12 /* size_t geojson_size = strlen(geojson); */ -@@ -547,7 +552,7 @@ +@@ -547,7 +552,7 @@ lwgeom_from_geojson(const char *geojson, } return lwgeom; @@ -105,7 +105,7 @@ Last-Update: 2013-05-12 --- a/liblwgeom/cunit/cu_tester.c +++ b/liblwgeom/cunit/cu_tester.c -@@ -87,7 +87,7 @@ +@@ -87,7 +87,7 @@ int main(int argc, char *argv[]) surface_suite, homogenize_suite, force_sfs_suite, @@ -116,7 +116,7 @@ Last-Update: 2013-05-12 out_gml_suite, --- a/regress/Makefile.in +++ b/regress/Makefile.in -@@ -21,6 +21,7 @@ +@@ -21,6 +21,7 @@ POSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSI POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@ POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@ HAVE_JSON=@HAVE_JSON@ @@ -138,7 +138,7 @@ Last-Update: 2013-05-12 --- a/postgis/lwgeom_in_geojson.c +++ b/postgis/lwgeom_in_geojson.c -@@ -23,7 +23,7 @@ +@@ -23,7 +23,7 @@ Datum postgis_libjson_version(PG_FUNCTIO PG_FUNCTION_INFO_V1(postgis_libjson_version); Datum postgis_libjson_version(PG_FUNCTION_ARGS) { @@ -147,7 +147,7 @@ Last-Update: 2013-05-12 PG_RETURN_NULL(); #else /* HAVE_LIBJSON */ const char *ver = "UNKNOWN"; -@@ -35,7 +35,7 @@ +@@ -35,7 +35,7 @@ Datum postgis_libjson_version(PG_FUNCTIO PG_FUNCTION_INFO_V1(geom_from_geojson); Datum geom_from_geojson(PG_FUNCTION_ARGS) { -- 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