Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • gioele/postgis
  • debian-gis-team/postgis
2 results
Show changes
Commits on Source (11)
Showing
with 395 additions and 170 deletions
......@@ -144,6 +144,7 @@ raster/test/cunit/cu_tester
raster/test/Makefile
raster/test/regress/Makefile
raster/test/regress/rtpostgis.sql
raster/test/regress/loader/TiledAutoSkipNoData.tif
regress/00-regress-install/
regress/Makefile
regress/core/Makefile
......
......@@ -4,13 +4,17 @@ services:
language: c
env:
- tag=pg11-geos37-gdal24-proj52 mode=garden
# Use the last stable release to run more tests
- tag=pg12-geos37-gdal30-proj611 mode=garden
- tag=pg12-geos37-gdal30-proj611 mode=tests
- tag=pg12-geos37-gdal30-proj611 mode=debug
- tag=pg12-geos37-gdal30-proj611 mode=coverage
- tag=pg12-geos37-gdal30-proj611 mode=usan_gcc
- tag=pg12-clang-geos37-gdal30-proj611 mode=usan_clang
- tag=pg12-geos37-gdal30-proj611 mode=nowagyu
# Run tests with different dependecy combinations
- tag=latest mode=tests
- tag=pg11-geos37-gdal24-proj52 mode=debug
- tag=pg11-geos37-gdal24-proj52 mode=coverage
- tag=pg11-geos37-gdal24-proj52 mode=usan_gcc
- tag=pg11-clang-geos37-gdal24-proj52 mode=usan_clang
- tag=pg11-geos37-gdal24-proj52 mode=nowagyu
- tag=pg11-geos37-gdal24-proj52 mode=tests
- tag=pg10-geos36-gdal23-proj49 mode=tests
- tag=pg96-geos36-gdal22-proj49 mode=tests
......
PostGIS 3.0.0alpha4
2019/08/10
For full changes and enhancements, refer to PostGIS 3.0.0.
This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
Additional features enabled if you are running Proj6+ and PostgreSQL 12
* Major highlights *
- #4433, 32-bit hash fix (requires reindexing hash(geometry) indexes) (Raúl Marín)
- #4445, Fix a bug in geometry_le (Raúl Marín)
- #4451, Fix the calculation of gserialized_max_header_size (Raúl Marín)
- #4450, Speed up ST_GeometryType (Raúl Marín)
- #4452, Add ST_TileEnvelope() (Paul Ramsey)
- #4403, Support for shp2pgsql ability to reproject with copy mode (-D) (Regina Obe)
- #4417, Update spatial_ref_sys with new entries (Paul Ramsey)
- #4449, Speed up ST_X, ST_Y, ST_Z and ST_M (Raúl Marín)
- #4454, Speed up _ST_OrderingEquals (Raúl Marín)
- #4453, Speed up ST_IsEmpty (Raúl Marín)
- #4271, postgis_extensions_upgrade() also updates after pg_upgrade (Raúl Marín)
- #4466, Fix undefined behaviour in _postgis_gserialized_stats (Raúl Marín)
- #4209, Handle NULL geometry values in pgsql2shp (Paul Ramsey)
- #4419, Use protobuf version to enable/disable mvt/geobuf (Paul Ramsey)
- #4437, Handle POINT EMPTY in shape loader/dumper (Paul Ramsey)
- #4456, add Rasbery Pi 32-bit jenkins bot for testing (Bruce Rindahl,Regina Obe)
- #4420, update path does not exists for address_standardizer extension (Regina Obe)
PostGIS 3.0.0alpha3
2019/07/01
For full changes and enhancements, refer to PostGIS 3.0.0.
......@@ -93,6 +118,10 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
- #4334, Fix upgrade issues related to renamed function parameters (Raúl Marín)
- #4442, raster2pgsql now skips NODATA tiles. Use -k option if you still want
them in database for some reason. (Darafei Praliaskouski)
- #4433, 32-bit hash fix (requires reindexing hash(geometry) indexes) (Raúl Marín)
- #3383, Sorting now uses Hilbert curve and Postgres Abbreviated Compare.
You need to REINDEX your btree indexes if you had them.
(Darafei Praliaskouski)
* New Features *
- #2902, postgis_geos_noop (Sandro Santilli)
......@@ -107,9 +136,10 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
- #1833, ST_AsGeoJSON(row) generates full GeoJSON Features (Joe Conway)
- #3687, Casts json(geometry) and jsonb(geometry) for implicit GeoJSON
generation (Paul Ramsey)
- #4198, Add ST_ConstrainedDelaunayTriangles SFCGAL function (Darafei
Praliaskouski)
* Enhancements and fixes *
- #4342, Move deprecated functions into legacy.sql file
* Enhancements *
- #4341, Using "support function" API in PgSQL 12+ to replace SQL inlining
as the mechanism for providing index support under ST_Intersects, et al
- #4330, postgis_restore OOM when output piped to an intermediate process
......@@ -125,22 +155,10 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
- #4176, ST_Intersects supports GEOMETRYCOLLECTION (Darafei Praliaskouski)
- #4181, ST_AsMVTGeom: Avoid type changes due to validation (Raúl Marín)
- #4183, ST_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
- #4188, Avoid division by zero in KMeans (Raúl Marín)
- #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
- #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)
- #4211, Fix ST_Subdivide for minimal exterior ring with minimal hole (Darafei
Praliaskouski)
- #3457, Fix raster envelope shortcut in ST_Clip (Sai-bot)
- #4215, Use floating point compare in ST_DumpAsPolygons (Darafei Praliaskouski)
- #4155, Support for GEOMETRYCOLLECTION, POLYGON, TIN, TRIANGLE in
ST_LocateBetween and ST_LocateBetweenElevations (Darafei Praliaskouski)
- #2767, Documentation for AddRasterConstraint optional parameters (Sunveer Singh)
- #4326, Allocate enough memory in gidx_to_string (Raúl Marín)
- #4190, Avoid undefined behaviour in gserialized_estimate (Raúl Marín)
- #4233, Fix undefined behaviour in gserialized_spgist_picksplit_nd (Raúl Marín)
- #4247, Avoid undefined behaviour in next_float functions (Raúl Marín)
- #4249, Fix undefined behaviour in raster intersection (Raúl Marín)
- #4246, Fix undefined behaviour in ST_3DDistance (Raúl Marín)
- #4244, Avoid unaligned memory access in BOX2D_out (Raúl Marín)
- #4139, Make mixed-dimension ND index build tree correctly (Darafei Praliaskouski,
Arthur Lesuisse, Andrew Gierth, Raúl Marín)
......@@ -151,17 +169,13 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
- #4301, ST_Subdivide: fix endless loop on coordinates near coincident to bounds
(Darafei Praliaskouski)
- #4289, ST_AsMVTGeom: Transform coordinates space before clipping (Raúl Marín)
- #4275, Avoid passing a NULL pointer to GEOSisEmpty (Raúl Marín)
- #4296, Use `server_version_num` instead of parsing `version()` (Raúl Marín)
- #4272, Improve notice message when unable to compute stats (Raúl Marín)
- #4314, ST_ClipByBox2D: Do not throw when the geometry is invalid (Raúl Marín)
- #4313, #4307, PostgreSQL 12 compatibility (Laurenz Albe, Raúl Marín)
- #4299, #4304, ST_GeneratePoints is now VOLATILE. IMMUTABLE version with
seed parameter added. (Mike Taves)
- #4278, ST_3DDistance and ST_3DIntersects now support Solid TIN and Solid
POLYHEDRALSURFACE (Darafei Praliaskouski)
- #4348, ST_AsMVTGeom (GEOS): Enforce validation at all times (Raúl Marín)
- #4361, Fix postgis_type_name with (GEOMETRYM,3) (Matt Bretl)
- #4295, Allow GEOMETRYCOLLECTION in ST_Overlaps, ST_Contains, ST_ContainsProperly,
ST_Covers, ST_CoveredBy, ST_Crosses, ST_Touches, ST_Disjoint, ST_Relate,
ST_Equals (Esteban Zimányi)
......@@ -172,21 +186,50 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
- #4368, Reorder LWGEOM struct members to minimize extra padding (Raúl Marín)
- #4141, Use uint64 to handle row counts in the topology extension (Raúl Marín)
- #4225, Upgrade tiger to use tiger 2018 census files
- #4198, Add ST_ConstrainedDelaunayTriangles SFCGAL function (Darafei
Praliaskouski)
- #4412, Support ingesting rasters with NODATA=NaN (Darafei Praliaskouski)
- #4413, Raster tile size follows GeoTIFF block size on raster2pgsql -t auto
(Darafei Praliaskouski)
- #4422, Modernize Python 2 code to get ready for Python 3 (Christian Clauss)
- #4383, Fix undefined behaviour in implicit conversions (Raúl Marín)
- #4352, Use CREATE OR REPLACE AGGREGATE for PG12+ (Raúl Marín)
- #4394, Allow FULL OUTER JOIN on geometry equality operator (Darafei Praliaskouski)
- #4441, Make GiST penalty friendly to multi-column indexes and build single-column
ones faster. (Darafei Praliaskouski)
- #4403, Support for shp2pgsql ability to reproject with copy mode (-D) (Regina Obe)
- #4410, More descriptive error messages about SRID mismatch (Darafei Praliaskouski)
- #4399, TIN and Triangle output support in all output functions (Darafei
Praliaskouski)
- #3719, Impose minimum number of segments per arc during linearization
(Dan Baston / City of Helsinki, Raúl Marín)
- #4277, ST_GeomFromGeoJSON now marks SRID=4326 by default as per RFC7946,
ST_AsGeoJSON sets SRID in JSON output if it differs from 4326.
(Darafei Praliaskouski)
* Fixes *
- #4342, Move deprecated functions into legacy.sql file
- #4445, Fix a bug in geometry_le (Raúl Marín)
- #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
- #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)
- #4211, Fix ST_Subdivide for minimal exterior ring with minimal hole (Darafei
Praliaskouski)
- #4326, Allocate enough memory in gidx_to_string (Raúl Marín)
- #4190, Avoid undefined behaviour in gserialized_estimate (Raúl Marín)
- #4233, Fix undefined behaviour in gserialized_spgist_picksplit_nd (Raúl Marín)
- #4247, Avoid undefined behaviour in next_float functions (Raúl Marín)
- #4249, Fix undefined behaviour in raster intersection (Raúl Marín)
- #4246, Fix undefined behaviour in ST_3DDistance (Raúl Marín)
- #4188, Avoid division by zero in KMeans (Raúl Marín)
- #3457, Fix raster envelope shortcut in ST_Clip (Sai-bot)
- #4361, Fix postgis_type_name with (GEOMETRYM,3) (Matt Bretl)
- #4275, Avoid passing a NULL pointer to GEOSisEmpty (Raúl Marín)
- #4296, Use `server_version_num` instead of parsing `version()` (Raúl Marín)
- #4314, ST_ClipByBox2D: Do not throw when the geometry is invalid (Raúl Marín)
- #4383, Fix undefined behaviour in implicit conversions (Raúl Marín)
- #4334, Fix upgrade issues related to renamed function parameters (Raúl Marín)
- #4388, AddRasterConstraints: Ignore NULLs when generating constraints (Raúl Marín)
- #4327, Avoid pfree'ing the result of getenv (Raúl Marín)
- #4406, Throw on invalid characters when decoding geohash (Raúl Marín)
- #4394, Allow FULL OUTER JOIN on geometry equality operator (Darafei Praliaskouski)
- #4441, Make GiST penalty friendly to multi-column indexes and build single-column
ones faster. (Darafei Praliaskouski)
- #4459, Fix ST_Subdivide crash on intermediate EMPTY (Darafei Praliaskouski)
- #4470, ST_GeomFromGeoJSON crash on empty rings (Darafei Praliaskouski)
PostGIS 2.5.0
......
......@@ -4,6 +4,7 @@ Winnie:
[![Build Status](https://winnie.postgis.net:444/buildStatus/icon?job=PostGIS_trunk)](https://winnie.postgis.net:444/view/PostGIS/job/PostGIS_trunk/)
Dronie:
[![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-trunk)](https://dronie.osgeo.org/postgis/postgis?branch=svn-trunk)
Travis:
[![Build Status](https://api.travis-ci.org/postgis/postgis.svg?branch=svn-trunk,svn-2.5,svn-2.4,svn-2.3)](http://travis-ci.org/postgis/postgis)
GitLab-CI:
......@@ -12,6 +13,14 @@ Drone.io:
[![Build Status](https://cloud.drone.io/api/badges/postgis/postgis/status.svg?branch=svn-trunk)](https://cloud.drone.io/postgis/postgis?branch=svn-trunk)
Bessie:
[![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dbessie)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie/)
Bessie32:
[![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dbessie32)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie32/)
Berrie:
[![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dberrie)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie/)
This file is here to play nicely with modern code repository facilities.
Actual readme is [here](README.postgis).
......
......@@ -5,7 +5,7 @@
POSTGIS_MAJOR_VERSION=3
POSTGIS_MINOR_VERSION=0
POSTGIS_MICRO_VERSION=0alpha3
POSTGIS_MICRO_VERSION=0alpha4
# Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
# when changing POSTGIS_MINOR_VERSION
......
#Berrie is a 32-bit Rasberry Pi managed by Bruce Rindahl
#This is script to launch custom compiled PostgreSQL
#export label=berrie #this is passed in via Jenkins
export WORKSPACE=/home/jenkins/workspace
export OS_BUILD=32
export PG_VER=12
export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
export PATH=${PATH}:${PGPATH}/bin:${PGPATH}/lib
export PGPORT=55432
export PGDATA=$PGPATH/data_${PGPORT}
export PGLOG="$PGDATA/pgsql.log"
# What to use to start up the postmaster
DAEMON="$PGPATH/bin/pg_ctl -D $PGDATA -l logfile start"
# What to use to shut down the postmaster
PGCTL="$PGPATH/bin/pg_ctl"
# remove cluster if exists
if [ -d $PGDATA ] ; then
if [ -d $PGDATA/postmaster.pid] ; then
$PGCTL stop -D $PGDATA -s -m fast
fi;
rm -rf $PGDATA
fi;
#initialize cluster
$PGPATH/bin/initdb
echo -n "Starting PostgreSQL: "
$DAEMON &
#sleep a bit because sometimes postgres takes a bit to start up
sleep 20
echo "ok"
exit 0
\ No newline at end of file
#!/bin/bash
#bessie is a 32-bit Rasberry Pi managed by Bruce Rindahl
## BRANCH is passed in via jenkins which is set via gitea web hook
#export BRANCH=618a67b1d6fc223dd5a4c0b02c824939f21dbd65
## label is set by jenkins
#export label=${label}
export WORKSPACE=/home/jenkins/workspace
cd ${WORKSPACE}/PostGIS_Worker_Run/label/${label}/$BRANCH
export OS_BUILD=32
export PG_VER=12
export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
export PATH=${PATH}:${PGPATH}/bin:${PGPATH}/lib
export PGPORT=55432
export PGDATA=$PGPATH/data_${PGPORT}
export PGHOST=localhost
sh autogen.sh
./configure --with-pgconfig=${PGPATH}/bin/pg_config
#make clean
make
export err_status=0
make check RUNTESTFLAGS="-v"
make install
make check RUNTESTFLAGS="-v --extension"
err_status=$?
if [ -d $PGDATA/postmaster.pid ] ; then
$PGCTL stop -D $PGDATA -s -m fast
fi
exit $err_status
\ No newline at end of file
export PATH=${PATH}:/usr/local:/usr/local/lib:/usr/local/bin
sh autogen.sh
./configure --with-projdir=/usr/local --with-libiconv=/usr/local --without-interrupt-tests
./configure --with-libiconv=/usr/local --without-interrupt-tests
make clean
make
export PGUSER=postgres
......
......@@ -8,7 +8,7 @@ if [[ "${OVERRIDE}" == '' ]] ; then
export CGAL_VER=4.11
export ICON_VER=1.15
export ZLIB_VER=1.2.11
export PROTOBUF_VER=3.2.0
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
export JSON_VER=0.12
export PROJSO=libproj-12.dll
......@@ -170,7 +170,6 @@ LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYP
--prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
fi;
make clean
#patch liblwgeom generated make to get rid of dynamic linking
......
......@@ -15,8 +15,6 @@
#if no override is set - use these values
#otherwise use the ones jenkins passes thru
#!/bin/bash
#!/bin/bash
set -e
if [[ "${OVERRIDE}" == '' ]] ; then
export GEOS_VER=3.8
export GDAL_VER=2.2.4
......@@ -64,7 +62,7 @@ echo "LIBXML_VER $LIBXML_VER"
echo "CGAL_VER $CGAL_VER"
export PROJECTS=/projects
export MINGPROJECTS=/projects
export PROJECTS=/projects
export PATHOLD=$PATH
......@@ -115,7 +113,7 @@ export RELDIR=${PROJECTS}/postgis/builds/${POSTGIS_MINOR_VER}
export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD}${GCC_TYPE}
export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
export PCRE_VER=8.33
#PATH="${PGPATH}/bin:${PGPATH}/lib:${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
#PATH="${PGPATH}/bin:${PGPATH}/lib:${PROJECTS}/xsltproc:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
#echo PATH AFTER: $PATH
outdir="${RELDIR}/${RELVERDIR}"
package="${RELDIR}/${RELVERDIR}.zip"
......@@ -137,11 +135,11 @@ cp ${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdi
# it seems 9.2 and 9.3 doesn't come with its own libiconv good grief
# and trying to use their libiconv2.dll makes shp2pgsql crash
if [[ "$PG_VER" == *9.2* || "$PG_VER" == *9.3* ]]; then
cp ${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
cp ${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
fi;
cp ${PGPATHEDB}/bin/libpq.dll $outdir/bin/postgisgui
#cp ${PGPATHEDB}/bin/libiconv2.dll $outdir/bin/postgisgui
cp ${MINGPROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/libicon*.dll $outdir/bin/postgisgui
cp ${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/libicon*.dll $outdir/bin/postgisgui
cp ${PGPATHEDB}/bin/libintl*.dll $outdir/bin/postgisgui
cp ${PGPATHEDB}/bin/ssleay32.dll $outdir/bin/postgisgui
......@@ -159,11 +157,11 @@ cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/*.dll $outdir/bin/postgisgui/li
cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/gdk-pixbuf-2.0 $outdir/bin/postgisgui/lib
cp ${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/share/proj/* $outdir/share/contrib/postgis-${POSTGIS_MINOR_VER}/proj
cp ${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
cp ${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/share/proj/* $outdir/share/contrib/postgis-${POSTGIS_MINOR_VER}/proj
cp ${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
cp ${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
cp ${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
#for protobuf
......@@ -203,8 +201,8 @@ fi;
echo "PROTOBUF VERSION: ${PROTOBUF_VER} https://github.com/google/protobuf" >> $verfile
echo "PROTOBUF-C VERSION: ${PROTOBUFC_VER} https://github.com/protobuf-c/protobuf-c" >> $verfile
#cp ${MINGPROJECTS}/libxml/rel-libxml2-2.7.8w${OS_BUILD}/bin/*.dll $outdir/bin/
cp ${PGPATHEDB}/bin/libxml2-2.dll $outdir/bin/
cp ${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}/bin/*.dll $outdir/bin/
#cp ${PGPATHEDB}/bin/libxml2-2.dll $outdir/bin/
cd ${POSTGIS_SRC}
strip postgis/*.dll
......
......@@ -684,6 +684,7 @@ GTK_CFLAGS
HAVE_PROTOBUF
PROTOBUF_LDFLAGS
PROTOBUF_CPPFLAGS
PROTOCC_VERSION
PROTOCC
PROTOBUFC_LIBS
PROTOBUFC_CFLAGS
......@@ -17832,6 +17833,62 @@ $as_echo "#define HAVE_LIBPROTOBUF 1" >>confdefs.h
fi
fi
 
if test "$HAVE_PROTOBUF" = "yes"; then
# Extract the first word of "protoc-c", so it can be a program name with args.
set dummy protoc-c; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PROTOCC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PROTOCC in
[\\/]* | ?:[\\/]*)
ac_cv_path_PROTOCC="$PROTOCC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PROTOCC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
PROTOCC=$ac_cv_path_PROTOCC
if test -n "$PROTOCC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROTOCC" >&5
$as_echo "$PROTOCC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
PROTOCC_SEMVER=$($PROTOCC --version | grep protobuf-c | awk '{print $2}')
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking protoc-c version... $PROTOCC_SEMVER" >&5
$as_echo "checking protoc-c version... $PROTOCC_SEMVER" >&6; }
PROTOCC_VERSION_MAJOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $1}')
PROTOCC_VERSION_MINOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $2}')
PROTOCC_VERSION_PATCH=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $3}')
PROTOCC_VERSION=$(expr 10000 \* $PROTOCC_VERSION_MAJOR + 100 \* $PROTOCC_VERSION_MINOR + $PROTOCC_VERSION_PATCH)
if test $PROTOCC_VERSION -ge 10100; then
$as_echo "#define HAVE_GEOBUF 1" >>confdefs.h
fi
fi
 
 
 
......@@ -25532,8 +25589,14 @@ $as_echo " Libxml2 config: ${XML2CONFIG}" >&6; }
$as_echo " Libxml2 version: ${POSTGIS_LIBXML2_VERSION}" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: JSON-C support: ${HAVE_JSON}" >&5
$as_echo " JSON-C support: ${HAVE_JSON}" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: protobuf-c support: ${HAVE_PROTOBUF}" >&5
$as_echo " protobuf-c support: ${HAVE_PROTOBUF}" >&6; }
if test "x$HAVE_PROTOBUF" = "xyes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: protobuf-c version: ${PROTOCC_SEMVER}" >&5
$as_echo " protobuf-c version: ${PROTOCC_SEMVER}" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: PCRE support: ${HAVE_PCRE}" >&5
$as_echo " PCRE support: ${HAVE_PCRE}" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Perl: ${PERL}" >&5
......
......@@ -1044,6 +1044,21 @@ if test "$CHECK_PROTOBUF" != "no"; then
fi
fi
dnl Get version number for protoc-c
if test "$HAVE_PROTOBUF" = "yes"; then
AC_PATH_PROG(PROTOCC, protoc-c)
PROTOCC_SEMVER=$($PROTOCC --version | grep protobuf-c | awk '{print $2}')
AC_MSG_RESULT([checking protoc-c version... $PROTOCC_SEMVER])
PROTOCC_VERSION_MAJOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $1}')
PROTOCC_VERSION_MINOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $2}')
PROTOCC_VERSION_PATCH=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $3}')
PROTOCC_VERSION=$(expr 10000 \* $PROTOCC_VERSION_MAJOR + 100 \* $PROTOCC_VERSION_MINOR + $PROTOCC_VERSION_PATCH)
if test $PROTOCC_VERSION -ge 10100; then
AC_DEFINE([HAVE_GEOBUF], [1], [Define to 1 if libprotobuf-c is >= 1.1])
fi
fi
AC_SUBST([PROTOCC_VERSION])
AC_SUBST([PROTOBUF_CPPFLAGS])
AC_SUBST([PROTOBUF_LDFLAGS])
AC_SUBST([HAVE_PROTOBUF])
......@@ -1626,7 +1641,12 @@ AC_MSG_RESULT([ PROJ4 version: ${POSTGIS_PROJ_VERSION}])
AC_MSG_RESULT([ Libxml2 config: ${XML2CONFIG}])
AC_MSG_RESULT([ Libxml2 version: ${POSTGIS_LIBXML2_VERSION}])
AC_MSG_RESULT([ JSON-C support: ${HAVE_JSON}])
AC_MSG_RESULT([ protobuf-c support: ${HAVE_PROTOBUF}])
if test "x$HAVE_PROTOBUF" = "xyes"; then
AC_MSG_RESULT([ protobuf-c version: ${PROTOCC_SEMVER}])
fi
AC_MSG_RESULT([ PCRE support: ${HAVE_PCRE}])
AC_MSG_RESULT([ Perl: ${PERL}])
AC_MSG_RESULT([ Wagyu: ${HAVE_WAGYU}])
......
postgis (3.0.0~alpha3+dfsg-1~exp2) UNRELEASED; urgency=medium
postgis (3.0.0~alpha4+dfsg-2) UNRELEASED; urgency=medium
* debian/tests: Test postgis_raster extension as well.
* debian/tests/regress: Makefile.in needs some variables from ./configure.
* Instead of conflicting with older postgresql-*-postgis-*-scripts packages,
use the alternatives system for managing the extension/*.control files.
This finally allows us to depend on the -scripts package from the main
extension package.
* Remove unversioned and unused sql files from address standardizer.
-- Christoph Berg <myon@debian.org> Mon, 12 Aug 2019 10:55:44 +0200
postgis (3.0.0~alpha4+dfsg-1) experimental; urgency=medium
* New upstream alpha release.
* Drop cppflags patch, applied upstream.
-- Bas Couwenberg <sebastic@debian.org> Sun, 11 Aug 2019 09:46:58 +0200
postgis (3.0.0~alpha3+dfsg-1~exp2) experimental; urgency=medium
[ Christoph Berg ]
* debian/tests/control: Tests don't need root, but support running as root.
......@@ -10,8 +29,10 @@ postgis (3.0.0~alpha3+dfsg-1~exp2) UNRELEASED; urgency=medium
* Update gbp.conf to use --source-only-changes by default.
* Bump Standards-Version to 4.4.0, no changes.
* Update PIE hardening conditional, trusty is EOL.
* Merge -arch & -indep targets.
(closes: #932833)
-- Christoph Berg <myon@debian.org> Tue, 02 Jul 2019 14:38:52 +0200
-- Bas Couwenberg <sebastic@debian.org> Tue, 23 Jul 2019 21:51:42 +0200
postgis (3.0.0~alpha3+dfsg-1~exp1) experimental; urgency=medium
......
......@@ -97,9 +97,9 @@ Description: Geographic objects support for PostgreSQL -- documentation
Package: postgresql-11-postgis-3
Architecture: any
Depends: postgresql-11,
postgresql-11-postgis-3-scripts,
${shlibs:Depends},
${misc:Depends}
Recommends: postgresql-11-postgis-3-scripts
Suggests: postgis
Breaks: postgis (<< 1.2.1)
Provides: postgresql-11-postgis,
......@@ -121,11 +121,6 @@ Multi-Arch: foreign
Depends: ${perl:Depends},
${misc:Depends}
Recommends: postgresql-11-postgis-3
Breaks: postgresql-11-postgis-scripts (<< 2.2.2+dfsg-3~)
Conflicts: postgresql-11-postgis-2.2-scripts,
postgresql-11-postgis-2.3-scripts,
postgresql-11-postgis-2.4-scripts,
postgresql-11-postgis-2.5-scripts
Provides: postgresql-11-postgis-scripts,
postgresql-postgis-scripts
Replaces: postgresql-11-postgis-scripts (<< 2.2.2+dfsg-3~)
......
......@@ -97,9 +97,9 @@ Description: Geographic objects support for PostgreSQL -- documentation
Package: postgresql-PGVERSION-postgis-3
Architecture: any
Depends: postgresql-PGVERSION,
postgresql-PGVERSION-postgis-3-scripts,
${shlibs:Depends},
${misc:Depends}
Recommends: postgresql-PGVERSION-postgis-3-scripts
Suggests: postgis
Breaks: postgis (<< 1.2.1)
Provides: postgresql-PGVERSION-postgis,
......@@ -121,11 +121,6 @@ Multi-Arch: foreign
Depends: ${perl:Depends},
${misc:Depends}
Recommends: postgresql-PGVERSION-postgis-3
Breaks: postgresql-PGVERSION-postgis-scripts (<< 2.2.2+dfsg-3~)
Conflicts: postgresql-PGVERSION-postgis-2.2-scripts,
postgresql-PGVERSION-postgis-2.3-scripts,
postgresql-PGVERSION-postgis-2.4-scripts,
postgresql-PGVERSION-postgis-2.5-scripts
Provides: postgresql-PGVERSION-postgis-scripts,
postgresql-postgis-scripts
Replaces: postgresql-PGVERSION-postgis-scripts (<< 2.2.2+dfsg-3~)
......
Description: Add CPPFLAGS where missing. Spotted by blhc.
--- a/libpgcommon/Makefile.in
+++ b/libpgcommon/Makefile.in
@@ -58,7 +58,7 @@ check: libpgcommon.a
# Command to build each of the .o files
$(SA_OBJS): %.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
$(SA_OBJS): ../postgis_config.h
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -88,13 +88,13 @@ $(LIBLWGEOM):
$(MAKE) -C ../liblwgeom
shp2pgsql-core.o: shp2pgsql-core.c shp2pgsql-core.h shpcommon.h
- $(CC) $(CFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
pgsql2shp-core.o: pgsql2shp-core.c pgsql2shp-core.h shpcommon.h
- $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2shp-core.h shpcommon.h
- $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
$(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
$(LIBTOOL) --mode=link \
@@ -105,7 +105,7 @@ $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgs
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
- $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
$(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
$(LIBTOOL) --mode=link \
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -79,7 +79,7 @@ LDFLAGS = \
all: $(RASTER2PGSQL)
raster2pgsql.o: raster2pgsql.c
- $(CC) $(CFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
$(RASTER2PGSQL): $(RT_CORE)/librtcore.a raster2pgsql.o
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
relax-test-timing-constraints.patch
cppflags
#!/bin/sh
set -eu
DIR="/usr/share/postgresql/@PGVERSION@/extension"
MAJOR_VERSION="3"
case $1 in
configure)
# first move files from versions without the alternatives system away
for ext in postgis postgis_raster postgis_sfcgal postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
dpkg-divert --package postgresql-@PGVERSION@-postgis-$MAJOR_VERSION-scripts --rename \
--divert $DIR/$ext-old.control --add $DIR/$ext.control
done
# install our alternatives (priority is "30" for compatibility with 2.5, "25")
update-alternatives \
--install $DIR/postgis.control postgis.control $DIR/postgis-$MAJOR_VERSION.control ${MAJOR_VERSION}0 \
--slave $DIR/postgis_raster.control postgis_raster.control $DIR/postgis_raster-$MAJOR_VERSION.control \
--slave $DIR/postgis_sfcgal.control postgis_sfcgal.control $DIR/postgis_sfcgal-$MAJOR_VERSION.control \
--slave $DIR/postgis_tiger_geocoder.control postgis_tiger_geocoder.control $DIR/postgis_tiger_geocoder-$MAJOR_VERSION.control \
--slave $DIR/postgis_topology.control postgis_topology.control $DIR/postgis_topology-$MAJOR_VERSION.control \
--slave $DIR/address_standardizer.control address_standardizer.control $DIR/address_standardizer-$MAJOR_VERSION.control \
--slave $DIR/address_standardizer_data_us.control address_standardizer_data_us.control $DIR/address_standardizer_data_us-$MAJOR_VERSION.control
# add alternatives for old versions (priority is "1")
test -f $DIR/postgis-old.control && update-alternatives \
--install $DIR/postgis.control postgis.control $DIR/postgis-old.control 1 \
--slave $DIR/postgis_raster.control postgis_raster.control $DIR/postgis_raster-old.control \
--slave $DIR/postgis_sfcgal.control postgis_sfcgal.control $DIR/postgis_sfcgal-old.control \
--slave $DIR/postgis_tiger_geocoder.control postgis_tiger_geocoder.control $DIR/postgis_tiger_geocoder-old.control \
--slave $DIR/postgis_topology.control postgis_topology.control $DIR/postgis_topology-old.control \
--slave $DIR/address_standardizer.control address_standardizer.control $DIR/address_standardizer-old.control \
--slave $DIR/address_standardizer_data_us.control address_standardizer_data_us.control $DIR/address_standardizer_data_us-old.control
;;
esac
#DEBHELPER#
exit 0
#!/bin/sh
set -eu
DIR="/usr/share/postgresql/@PGVERSION@/extension"
MAJOR_VERSION="3"
case $1 in
remove)
# remove our alternatives
update-alternatives --remove postgis.control $DIR/postgis-$MAJOR_VERSION.control
# remove alternatives for older versions
# (this is not totally correct, but we don't have a better place to put it,
# and it's only wrong when an old version and at least two "new" versions
# are installed, and one of the new versions is removed)
update-alternatives --remove postgis.control $DIR/postgis-old.control
# move any diverted files back
for ext in postgis postgis_raster postgis_sfcgal postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
dpkg-divert --package postgresql-@PGVERSION@-postgis-$MAJOR_VERSION-scripts --rename \
--remove $DIR/$ext.control
done
;;
esac
#DEBHELPER#
exit 0
......@@ -91,12 +91,9 @@ endif
override_dh_autoreconf:
dh_autoreconf ./autogen.sh
override_dh_clean:
dh_clean build-arch-stamp
override_dh_auto_clean: debian/control
# Clean all separate build directories.
(set -e; \
(set -ex; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
rm -rf $(CURDIR)/debian/build-$$PGVER; \
done)
......@@ -112,6 +109,8 @@ override_dh_auto_clean: debian/control
# Cleanup auto-generated packaging control files
rm -f $(CURDIR)/debian/postgresql-*-postgis-*.install
rm -f $(CURDIR)/debian/postgresql-*-postgis-*-scripts.install
rm -f $(CURDIR)/debian/postgresql-*-postgis-*-scripts.postinst
rm -f $(CURDIR)/debian/postgresql-*-postgis-*-scripts.prerm
rm -f loader/cunit/cu_tester
rm -rf liblwgeom/cunit/.libs
......@@ -119,7 +118,7 @@ override_dh_auto_configure:
# Copy sources required to build extensions for all but the most
# recent Postgres version. Unfortunately, Postgis doesn't support
# vpath builds.
(set -e; \
(set -ex; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
mkdir $(CURDIR)/debian/build-$$PGVER; \
for FILE in `ls $(CURDIR) | grep -v debian`; do \
......@@ -143,8 +142,17 @@ override_dh_auto_configure:
--with-pgconfig=/usr/lib/postgresql/$$PGVER/bin/pg_config; \
done)
override_dh_auto_build-arch: build-arch-stamp
build-arch-stamp:
override_dh_auto_build:
# Create debhelper files for each Postgres major version
(set -ex; \
for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
for SUFFIX in .install -scripts.install -scripts.postinst -scripts.prerm; do \
cat $(CURDIR)/debian/postgresql-generic-postgis$$SUFFIX.in \
| sed -e "s/@PGVERSION@/$$PGVER/g" \
> $(CURDIR)/debian/postgresql-$$PGVER-postgis-$(MAJOR_VERSION)$$SUFFIX; \
done \
done)
# Build against the newest Postgres version
@echo " ### building $(NEWEST_POSTGRES_VERSION) ###"
$(MAKE) $(NJOBS)
......@@ -157,9 +165,6 @@ build-arch-stamp:
$(MAKE) $(NJOBS) -C $(CURDIR)/debian/build-$$PGVER; \
done)
touch $@
override_dh_auto_build-indep: build-arch-stamp
# Let PostGIS create a perl script from postgis_restore.pl.in
$(MAKE) $(NJOBS) -C utils
......@@ -173,9 +178,7 @@ override_dh_auto_build-indep: build-arch-stamp
# clever enough to run this before 'install'.
$(MAKE) $(NJOBS) -C extensions
override_dh_auto_test-indep:
override_dh_auto_test-arch:
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Run unit tests (against the newest Postgres version, first)
echo " ### testing $(NEWEST_POSTGRES_VERSION) ###"
......@@ -191,7 +194,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
done
endif
override_dh_auto_install-indep:
override_dh_auto_install:
# Install the most recent Postgres version. Note that we used to
# install only utils and extensions. However, there are sql scripts
# in postgis, raster and topology as well, which need to be
......@@ -205,57 +208,27 @@ override_dh_auto_install-indep:
install DESTDIR=$(CURDIR)/debian/tmp; \
done)
# Compile and install docs
$(MAKE) -C doc docs-install \
DESTDIR=$(CURDIR)/debian/tmp \
PGSQL_DOCDIR=/usr/share/doc
override_dh_install-indep:
dh_install -i
# Set executable bit for postgis_restore.pl
chmod 755 $(CURDIR)/debian/*/usr/share/postgresql/*/contrib/postgis-*/postgis_restore.pl
# Remove unversioned and unused files from address standardizer
rm -fv debian/tmp/usr/share/postgresql/*/extension/address_standardizer.sql
rm -fv debian/tmp/usr/share/postgresql/*/extension/address_standardizer_data_us.sql
# De-duplicate upgrade scripts - using hard-links for exactly one
# directory (so we don't generate cross-directory hard ones).
(set -e; \
# Move extension control files to version-specific names
# (otherwise, the -script packages from different major versions would conflict)
(set -ex; \
for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
rdfind -makeresultsfile false -makehardlinks true \
$(CURDIR)/debian/postgresql-$$PGVER-postgis-*-scripts/usr/share/postgresql/$$PGVER/extension; \
for control in $(CURDIR)/debian/tmp/usr/share/postgresql/$$PGVER/extension/*.control; do \
mv $$control $${control%.control}-$(MAJOR_VERSION).control; \
done \
done)
# Don't include desktop file & application icons in scripts package
rm -rf debian/postgresql-*-postgis-*-scripts/usr/share/postgresql/*/applications
rm -rf debian/postgresql-*-postgis-*-scripts/usr/share/postgresql/*/icons
override_dh_auto_install-arch:
# Install the extension for the most recent Postgres verison
$(MAKE) $(NJOBS) install DESTDIR=$(CURDIR)/debian/tmp
# Install the extensions for the older Postgres versions
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
$(MAKE) $(NJOBS) -C $(CURDIR)/debian/build-$$PGVER \
install DESTDIR=$(CURDIR)/debian/tmp; \
done)
touch $@
# Install docs and man pages
$(MAKE) -C doc man-install \
# Compile and install docs
$(MAKE) -C doc docs-install man-install \
DESTDIR=$(CURDIR)/debian/tmp \
PGSQL_DOCDIR=/usr/share/doc \
PGSQL_MANDIR=/usr/share/man
# Auto-create required .install file for each Postgres major version
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
cat $(CURDIR)/debian/postgresql-generic-postgis.install.in \
| sed -e "s/@PGVERSION@/$$PGVER/" \
> $(CURDIR)/debian/postgresql-$$PGVER-postgis-$(MAJOR_VERSION).install; \
cat $(CURDIR)/debian/postgresql-generic-postgis-scripts.install.in \
| sed -e "s/@PGVERSION@/$$PGVER/" \
> $(CURDIR)/debian/postgresql-$$PGVER-postgis-$(MAJOR_VERSION)-scripts.install; \
done)
# Move binaries from the NEWEST_POSTGRES_VERSION build to the
# 'postgis' binary package.
mkdir -p $(CURDIR)/debian/postgis/usr/bin
......@@ -273,12 +246,27 @@ override_dh_auto_install-arch:
mv $(CURDIR)/debian/tmp/usr/share/postgresql/$(NEWEST_POSTGRES_VERSION)/icons \
$(CURDIR)/debian/postgis-gui/usr/share/
override_dh_install-arch:
# Set executable bit for postgis_restore.pl
chmod 755 $(CURDIR)/debian/*/usr/share/postgresql/*/contrib/postgis-*/postgis_restore.pl
# De-duplicate upgrade scripts - using hard-links for exactly one
# directory (so we don't generate cross-directory hard ones).
(set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
rdfind -makeresultsfile false -makehardlinks true \
$(CURDIR)/debian/postgresql-$$PGVER-postgis-*-scripts/usr/share/postgresql/$$PGVER/extension; \
done)
# Don't include desktop file & application icons in scripts package
rm -rf debian/postgresql-*-postgis-*-scripts/usr/share/postgresql/*/applications
rm -rf debian/postgresql-*-postgis-*-scripts/usr/share/postgresql/*/icons
override_dh_install:
$(RM) $(CURDIR)/debian/tmp/usr/lib/postgresql/*/bin/*
$(RM) $(CURDIR)/debian/tmp/usr/share/doc/postgis/README.postgis
$(RM) $(CURDIR)/debian/tmp/usr/share/doc/postgresql-doc-*/extension/README.address_standardizer
dh_install -a --list-missing
dh_install --list-missing
override_dh_makeshlibs:
dh_makeshlibs -Xusr/lib/postgis -- -v$(UPSTREAM_VERSION)
......