[refs/tags/2.0.3: from 02d28254bf3437a13be5cbab9012302684794572 to a3b3de2840ed773a9cd5fc2d7575a0b0cedacb08] diff --git a/doc/postgis.xml b/doc/postgis.xml index 2b38af0..f15a392 100644 --- a/doc/postgis.xml +++ b/doc/postgis.xml @@ -6,10 +6,10 @@ - + - + [refs/tags/2.1.0beta1: from dd1d97cd2c2bd53b1ccacf122f35121196b9889d to d80c727c9748d04bc7027dede60137c5656ed909] diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in index ef5dcea..7ffa14f 100644 --- a/doc/html/image_src/Makefile.in +++ b/doc/html/image_src/Makefile.in @@ -11,7 +11,9 @@ # ********************************************************************** CC=@CC@ -CFLAGS=@CFLAGS@ @WARNFLAGS@ @PROJ_CPPFLAGS@ +CFLAGS=@CFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ +LDFLAGS = @GEOS_LDFLAGS@ -lgeos_c +top_builddir = @top_builddir@ CUNIT_LDFLAGS=@CUNIT_LDFLAGS@ CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I../../../liblwgeom [refs/tags/2.1.3: from f3ec236dca1151b756a1b9bdbe8256f07595c01c to 9e63c55cc0968b991c8893f086c4bb7e81133ffb] diff --git a/doc/postgis.xml b/doc/postgis.xml index 260e985..e629191 100644 --- a/doc/postgis.xml +++ b/doc/postgis.xml @@ -8,7 +8,7 @@ - + [refs/tags/2.1.6: from 4771ab13d58bf41cffbe4f25b951278dc2de90fd to 5bf45bc83b5b5e01afc8022d229d8f6987ef1226] diff --git a/extensions/upgradeable_versions.mk b/extensions/upgradeable_versions.mk index 3a97857..24da730 100644 --- a/extensions/upgradeable_versions.mk +++ b/extensions/upgradeable_versions.mk @@ -1,11 +1,11 @@ UPGRADEABLE_VERSIONS = \ 2.0.0 \ - 2.0.1 \ - 2.0.2 \ - 2.0.3 \ - 2.0.4 \ - 2.0.5 \ - 2.0.6 \ + 2.0.1 \ + 2.0.2 \ + 2.0.3 \ + 2.0.4 \ + 2.0.5 \ + 2.0.6 \ 2.1.0rc1 \ 2.1.0rc2 \ 2.1.0rc3 \ @@ -13,15 +13,17 @@ UPGRADEABLE_VERSIONS = \ 2.1.1 \ 2.1.2 \ 2.1.3 \ - 2.1.4 - + 2.1.4 \ + 2.1.5 + UPGRADEABLE_VERSIONS_MINOR = \ 2.0.0 \ - 2.0.1 \ - 2.0.2 \ - 2.0.3 \ - 2.0.4 \ - 2.0.5 + 2.0.1 \ + 2.0.2 \ + 2.0.3 \ + 2.0.4 \ + 2.0.5 \ + 2.0.6 UPGRADEABLE_VERSIONS_PATCH = \ 2.1.0rc1 \ @@ -31,4 +33,5 @@ UPGRADEABLE_VERSIONS_PATCH = \ 2.1.1 \ 2.1.2 \ 2.1.3 \ - 2.1.4 + 2.1.4 \ + 2.1.5 diff --git a/java/jdbc_jtsparser/pom.xml b/java/jdbc_jtsparser/pom.xml index 1006663..6695f4b 100644 --- a/java/jdbc_jtsparser/pom.xml +++ b/java/jdbc_jtsparser/pom.xml @@ -12,7 +12,7 @@ org.postgis postgis-jdbc-jtsparser - 2.1.4dev + 2.1.6 jar Postgis JDBC Driver JTS Parser http://postgis.net [refs/tags/2.1.7: from 719d4afebe6d735fa080c98ecc83cafccddea3d8 to 478b1f9267fbec154b681bb740774c44bd20662e] diff --git a/doc/release_notes.xml b/doc/release_notes.xml index 2132647..63e19c7 100644 --- a/doc/release_notes.xml +++ b/doc/release_notes.xml @@ -7,7 +7,6 @@ Release 2.1.7 Release date: 2015-03-30 This is a critical bug fix release. - Bug Fixes #3086, ST_DumpValues() crashes backend on cleanup with invalid band indexes [refs/tags/2.2.0: from 142fe43e2c73af4cdf0fcfe3d3f4cf335fc91047 to 04baae8928e98e2efab49b2b5d9662c0b2b3739e] [refs/tags/2.2.0rc1: from b9fbdaeb2b88767bf4002a8cfe00523e3d47ccef to 443882c0517384dac0053584742eb2fda5089b96] diff --git a/configure.ac b/configure.ac index 0f0c89f..15a5cd1 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,17 @@ AC_SUBST([POSTGIS_MINOR_VERSION]) AC_SUBST([POSTGIS_MICRO_VERSION]) dnl +dnl Convert PostGIS version info into liblwgeom libtool-happy numbers +dnl +LIBLWGEOM_CURRENT=`expr $POSTGIS_MAJOR_VERSION + $POSTGIS_MINOR_VERSION` +LIBLWGEOM_AGE=$POSTGIS_MINOR_VERSION +LIBLWGEOM_REV=`echo $POSTGIS_MICRO_VERSION | perl -p -e 's/(\d+)\w*\d*/$1/g'` +AC_SUBST([LIBLWGEOM_CURRENT]) +AC_SUBST([LIBLWGEOM_AGE]) +AC_SUBST([LIBLWGEOM_REV]) + + +dnl dnl Search for flex/bison to build the parser dnl diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in index 84247b2..e8f639a 100644 --- a/liblwgeom/Makefile.in +++ b/liblwgeom/Makefile.in @@ -22,9 +22,9 @@ SHELL = @SHELL@ INSTALL = $(SHELL) ../install-sh LIBTOOL = @LIBTOOL@ -IFACE_CURRENT = $(shell expr @POSTGIS_MAJOR_VERSION@ + @POSTGIS_MINOR_VERSION@ ) -IFACE_AGE = @POSTGIS_MINOR_VERSION@ -IFACE_REV = $(subst dev,,@POSTGIS_MICRO_VERSION@) +IFACE_CURRENT = @LIBLWGEOM_CURRENT@ +IFACE_AGE = @LIBLWGEOM_AGE@ +IFACE_REV = @LIBLWGEOM_REV@ VERSION_INFO = $(IFACE_CURRENT):$(IFACE_REV):$(IFACE_AGE) diff --git a/make_dist.sh b/make_dist.sh index b4d7deb..da15671 100755 --- a/make_dist.sh +++ b/make_dist.sh @@ -23,6 +23,8 @@ fi outdir="postgis-$version" +cd .. + if [ -d "$outdir" ]; then echo "Output directory $outdir already exists." exit 1 []