The following commit has been merged in the master branch: commit 4fc7ffe474492181ccfef4affa4037b956d80c74 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Thu Sep 15 13:02:47 2011 +0200
Fix for PGSQL 9.1 added. diff --git a/debian/changelog b/debian/changelog index 86d859c..3ff7609 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -postgis (1.5.2-3) unstable; urgency=low - - * - - -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 15 Sep 2011 12:24:35 +0200 - postgis (1.5.2-2) unstable; urgency=low * Repository moved to git and changed Vcs-* fields in debian/control. @@ -17,10 +11,11 @@ postgis (1.5.2-2) unstable; urgency=low unexpected behavior on purging. Now each purge of postgresql-*-postgis will cause extension removal. (closes: #596663) - * Added PostgreSQL 9.1 support. + * Added PostgreSQL 9.1 support. New patch lwgeom_accum added + for supporting 9.1. (closes: #633111, #639474) - -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 08 Jul 2011 17:16:12 +0200 + -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 15 Sep 2011 13:01:50 +0200 postgis (1.5.2-1) unstable; urgency=low diff --git a/debian/patches/lwgeom_accum b/debian/patches/lwgeom_accum new file mode 100644 index 0000000..4e1c4c8 --- /dev/null +++ b/debian/patches/lwgeom_accum @@ -0,0 +1,17 @@ +Index: postgis/postgis/lwgeom_accum.c +=================================================================== +--- postgis.orig/postgis/lwgeom_accum.c 2011-03-24 17:12:30.000000000 +0100 ++++ postgis/postgis/lwgeom_accum.c 2011-09-15 13:00:16.000000000 +0200 +@@ -303,7 +303,12 @@ + FunctionCallInfoData fcinfo; + Datum result; + ++#if POSTGIS_PGSQL_VERSION > 90 ++ /* PgSLQ 9.1 requires five arcuments to InitFunctionCallInfoData */ ++ InitFunctionCallInfoData(fcinfo, NULL, 1, InvalidOid, NULL, NULL); ++#else + InitFunctionCallInfoData(fcinfo, NULL, 1, NULL, NULL); ++#endif + + fcinfo.arg[0] = arg1; + fcinfo.argnull[0] = false; diff --git a/debian/patches/series b/debian/patches/series index 9d74090..5237045 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ install generator +lwgeom_accum +lwgeom_accum.c -- PostGIS for PostgreSQL _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel