This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository postgis.
commit ca3835a4752662f86cda3e049638a10330d0855e Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Apr 4 15:53:17 2014 +0200 Refresh patches. --- debian/patches/debian-versions | 2 +- debian/patches/fix-armel | 26 +++++++++++++------------- debian/patches/fix-spelling | 8 ++++---- debian/patches/honor-build-flags | 8 ++++---- debian/patches/link-liblwgeom | 6 +++--- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/debian/patches/debian-versions b/debian/patches/debian-versions index 972b426..1433a7f 100644 --- a/debian/patches/debian-versions +++ b/debian/patches/debian-versions @@ -18,7 +18,7 @@ Last-Update: 2013-07-22 * Define the build date and the version number --- a/doc/Makefile.comments +++ b/doc/Makefile.comments -@@ -21,8 +21,8 @@ +@@ -21,8 +21,8 @@ MODULEDIR=contrib/$(MODULE_doc) DATA_built=postgis_comments.sql raster_comments.sql topology_comments.sql # PGXS information diff --git a/debian/patches/fix-armel b/debian/patches/fix-armel index 0f71a37..4a4066e 100644 --- a/debian/patches/fix-armel +++ b/debian/patches/fix-armel @@ -10,7 +10,7 @@ Last-Update: 2014-01-09 --- a/postgis/lwgeom_geos.c +++ b/postgis/lwgeom_geos.c -@@ -1990,6 +1990,7 @@ +@@ -1990,6 +1990,7 @@ Datum contains(PG_FUNCTION_ARGS) LWPOINT *point; RTREE_POLY_CACHE *poly_cache; bool result; @@ -18,7 +18,7 @@ Last-Update: 2014-01-09 PrepGeomCache *prep_cache; geom1 = (GSERIALIZED *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0)); -@@ -2037,15 +2038,15 @@ +@@ -2037,15 +2038,15 @@ Datum contains(PG_FUNCTION_ARGS) if ( poly_cache && poly_cache->ringIndices ) { @@ -37,7 +37,7 @@ Last-Update: 2014-01-09 } else { -@@ -2057,7 +2058,7 @@ +@@ -2057,7 +2058,7 @@ Datum contains(PG_FUNCTION_ARGS) lwpoint_free(point); PG_FREE_IF_COPY(geom1, 0); PG_FREE_IF_COPY(geom2, 1); @@ -46,7 +46,7 @@ Last-Update: 2014-01-09 { PG_RETURN_BOOL(TRUE); } -@@ -2213,6 +2214,7 @@ +@@ -2213,6 +2214,7 @@ Datum covers(PG_FUNCTION_ARGS) GSERIALIZED *geom1; GSERIALIZED *geom2; bool result; @@ -54,7 +54,7 @@ Last-Update: 2014-01-09 GBOX box1, box2; int type1, type2; LWGEOM *lwgeom; -@@ -2263,15 +2265,15 @@ +@@ -2263,15 +2265,15 @@ Datum covers(PG_FUNCTION_ARGS) if ( poly_cache && poly_cache->ringIndices ) { @@ -73,7 +73,7 @@ Last-Update: 2014-01-09 } else { -@@ -2284,7 +2286,7 @@ +@@ -2284,7 +2286,7 @@ Datum covers(PG_FUNCTION_ARGS) lwpoint_free(point); PG_FREE_IF_COPY(geom1, 0); PG_FREE_IF_COPY(geom2, 1); @@ -82,7 +82,7 @@ Last-Update: 2014-01-09 { PG_RETURN_BOOL(TRUE); } -@@ -2368,6 +2370,7 @@ +@@ -2368,6 +2370,7 @@ Datum coveredby(PG_FUNCTION_ARGS) GSERIALIZED *geom2; GEOSGeometry *g1, *g2; bool result; @@ -90,7 +90,7 @@ Last-Update: 2014-01-09 GBOX box1, box2; LWGEOM *lwgeom; LWPOINT *point; -@@ -2418,15 +2421,15 @@ +@@ -2418,15 +2421,15 @@ Datum coveredby(PG_FUNCTION_ARGS) if ( poly_cache && poly_cache->ringIndices ) { @@ -109,7 +109,7 @@ Last-Update: 2014-01-09 } else { -@@ -2439,7 +2442,7 @@ +@@ -2439,7 +2442,7 @@ Datum coveredby(PG_FUNCTION_ARGS) lwpoint_free(point); PG_FREE_IF_COPY(geom1, 0); PG_FREE_IF_COPY(geom2, 1); @@ -118,7 +118,7 @@ Last-Update: 2014-01-09 { PG_RETURN_BOOL(TRUE); } -@@ -2493,7 +2496,7 @@ +@@ -2493,7 +2496,7 @@ Datum crosses(PG_FUNCTION_ARGS) GSERIALIZED *geom1; GSERIALIZED *geom2; GEOSGeometry *g1, *g2; @@ -127,7 +127,7 @@ Last-Update: 2014-01-09 GBOX box1, box2; geom1 = (GSERIALIZED *)PG_DETOAST_DATUM(PG_GETARG_DATUM(0)); -@@ -2562,6 +2565,7 @@ +@@ -2562,6 +2565,7 @@ Datum geos_intersects(PG_FUNCTION_ARGS) GSERIALIZED *geom2; GSERIALIZED *serialized_poly; bool result; @@ -135,7 +135,7 @@ Last-Update: 2014-01-09 GBOX box1, box2; int type1, type2, polytype; LWPOINT *point; -@@ -2623,15 +2627,15 @@ +@@ -2623,15 +2627,15 @@ Datum geos_intersects(PG_FUNCTION_ARGS) if ( poly_cache && poly_cache->ringIndices ) { @@ -154,7 +154,7 @@ Last-Update: 2014-01-09 } else { -@@ -2644,7 +2648,7 @@ +@@ -2644,7 +2648,7 @@ Datum geos_intersects(PG_FUNCTION_ARGS) lwpoint_free(point); PG_FREE_IF_COPY(geom1, 0); PG_FREE_IF_COPY(geom2, 1); diff --git a/debian/patches/fix-spelling b/debian/patches/fix-spelling index 0a2a463..94c1e26 100644 --- a/debian/patches/fix-spelling +++ b/debian/patches/fix-spelling @@ -4,7 +4,7 @@ Last-Update: 2013-04-14 --- a/liblwgeom/lwout_wkt.c +++ b/liblwgeom/lwout_wkt.c -@@ -323,7 +323,7 @@ +@@ -323,7 +323,7 @@ static void lwcompound_to_wkt_sb(const L } else { @@ -13,7 +13,7 @@ Last-Update: 2013-04-14 } } stringbuffer_append(sb, ")"); -@@ -370,7 +370,7 @@ +@@ -370,7 +370,7 @@ static void lwcurvepoly_to_wkt_sb(const lwcompound_to_wkt_sb((LWCOMPOUND*)cpoly->rings[i], sb, precision, variant ); break; default: @@ -22,7 +22,7 @@ Last-Update: 2013-04-14 } } stringbuffer_append(sb, ")"); -@@ -418,7 +418,7 @@ +@@ -418,7 +418,7 @@ static void lwmcurve_to_wkt_sb(const LWM lwcompound_to_wkt_sb((LWCOMPOUND*)mcurv->geoms[i], sb, precision, variant ); break; default: @@ -31,7 +31,7 @@ Last-Update: 2013-04-14 } } stringbuffer_append(sb, ")"); -@@ -462,7 +462,7 @@ +@@ -462,7 +462,7 @@ static void lwmsurface_to_wkt_sb(const L lwcurvepoly_to_wkt_sb((LWCURVEPOLY*)msurf->geoms[i], sb, precision, variant); break; default: diff --git a/debian/patches/honor-build-flags b/debian/patches/honor-build-flags index 5f44f12..ce2d7fe 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 -@@ -19742,7 +19742,7 @@ +@@ -19742,7 +19742,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF diff --git a/debian/patches/link-liblwgeom b/debian/patches/link-liblwgeom index eace39d..0ecc7bc 100644 --- a/debian/patches/link-liblwgeom +++ b/debian/patches/link-liblwgeom @@ -6,7 +6,7 @@ Last-Update: 2013-04-23 --- a/postgis/Makefile.in +++ b/postgis/Makefile.in -@@ -83,14 +83,8 @@ +@@ -83,14 +83,8 @@ PG_OBJS= \ OBJS=$(PG_OBJS) # Libraries to link into the module (proj, geos) @@ -24,7 +24,7 @@ Last-Update: 2013-04-23 ifeq (@SFCGAL@,sfcgal) --- a/raster/rt_pg/Makefile.in +++ b/raster/rt_pg/Makefile.in -@@ -38,14 +38,7 @@ +@@ -38,14 +38,7 @@ SQL_OBJS=rtpostgis.sql rtpostgis_drop.sq OBJS=rt_pg.o # Libraries to link into the module (proj, geos) @@ -42,7 +42,7 @@ Last-Update: 2013-04-23 LIBPGCOMMON_LDFLAGS=../../libpgcommon/libpgcommon.a --- a/raster/loader/Makefile.in +++ b/raster/loader/Makefile.in -@@ -37,7 +37,7 @@ +@@ -37,7 +37,7 @@ PGSQL_BINDIR=@PGSQL_BINDIR@ RT_CORE=../rt_core -- 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