[postgis] 01/02: Merge tag 'debian/2.3.1+dfsg-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Sun Dec 4 17:38:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository postgis.
commit d818e2dff394442f563112f4d79b42b4528e93a8
Merge: aa80389 9ed9c13
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Dec 4 18:21:23 2016 +0100
Merge tag 'debian/2.3.1+dfsg-1' into jessie-backports
Conflicts:
debian/changelog
debian/control
debian/control.in
.drone.yml | 8 +-
ChangeLog | 164 +++++
NEWS | 25 +-
README.md | 20 +-
README.postgis | 6 +-
Version.config | 2 +-
configure | 62 ++
configure.ac | 24 +
debian/changelog | 20 +
debian/control | 83 ++-
debian/control.in | 83 ++-
debian/rules | 173 ++---
doc/doxygen.cfg.in | 2 +-
doc/extras_topology.xml | 32 +-
doc/reference_measure.xml | 7 +-
doc/reference_raster.xml | 2 +-
doc/release_notes.xml | 817 +++++++++++----------
doc/topology_comments.sql | 4 +-
doc/using_postgis_dataman.xml | 19 +-
extensions/address_standardizer/Makefile | 16 +-
.../address_standardizer.control | 2 +-
.../address_standardizer_data_us.control | 2 +-
extensions/postgis/Makefile | 4 +-
extensions/postgis/postgis.control | 2 +-
extensions/postgis_sfcgal/Makefile | 4 +-
extensions/postgis_sfcgal/postgis_sfcgal.control | 2 +-
extensions/postgis_tiger_geocoder/Makefile | 4 +-
.../postgis_tiger_geocoder.control | 2 +-
extensions/postgis_topology/Makefile | 4 +-
.../postgis_topology/postgis_topology.control | 2 +-
extensions/upgradeable_versions.mk | 3 +-
liblwgeom/lwgeodetic.c | 2 +
liblwgeom/lwgeom_geos.c | 2 +-
liblwgeom/lwstroke.c | 2 +
libpgcommon/gserialized_gist.c | 7 +-
libpgcommon/gserialized_gist.h | 13 +
postgis/brin_2d.c | 11 +-
postgis/brin_nd.c | 66 +-
postgis/gserialized_gist_2d.c | 7 +-
postgis/gserialized_gist_nd.c | 2 +-
postgis/postgis.sql.in | 40 +-
postgis/postgis_module.c | 7 +-
postgis/sqldefines.h | 12 +-
postgis_svn_revision.h | 2 +-
raster/rt_pg/rtpostgis.c | 46 +-
raster/rt_pg/rtpostgis.sql.in | 42 +-
regress/geography.sql | 4 +
regress/geography_expected | 1 +
regress/regress_brin_index.sql | 77 +-
regress/regress_brin_index_3d.sql | 134 +++-
regress/regress_brin_index_3d_expected | 41 ++
regress/regress_brin_index_expected | 21 +
utils/check_all_upgrades.sh | 24 +
53 files changed, 1447 insertions(+), 716 deletions(-)
diff --cc debian/changelog
index a1bfa6f,8c082e7..1ea3e00
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,29 @@@
+ postgis (2.3.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Use dh_install -a instead of deprecated -s option.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 29 Nov 2016 00:32:50 +0100
+
+ postgis (2.3.0+dfsg-3) unstable; urgency=medium
+
+ * Restructure control file with cme.
+ * Reorder (build) dependencies.
+ * Drop explicit liblwgeom-2.3-0 dependency from -postgis-2.3 package,
+ already set via ${shlibs:Depends}.
+ * Rewrite rules file to use dh sequencer.
+ * Rely on dpkg-buildflags instead of including buildflags.mk.
+ * Use DEB_BUILD_ARCH instead of DEB_HOST_ARCH.
+ * Fix unused substitution variable ${perl:Depends} for -scripts package.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 10 Oct 2016 15:32:04 +0200
+
+postgis (2.3.0+dfsg-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 08 Oct 2016 18:53:01 +0200
+
postgis (2.3.0+dfsg-2) unstable; urgency=medium
* Update pgversions to require PostgreSQL 9.2 or newer.
diff --cc debian/control
index aba6cf6,dcdbe89..bc9c434
--- a/debian/control
+++ b/debian/control
@@@ -1,27 -1,47 +1,47 @@@
Source: postgis
+ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+ Uploaders: Stephen Frost <sfrost at debian.org>,
+ Francesco Paolo Lovergine <frankie at debian.org>,
+ Markus Wanner <markus at bluegap.ch>,
+ Bas Couwenberg <sebastic at debian.org>
Section: misc
Priority: optional
- Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
- Uploaders: Stephen Frost <sfrost at debian.org>, Francesco Paolo
- Lovergine <frankie at debian.org>, Markus Wanner <markus at bluegap.ch>,
- Bas Couwenberg <sebastic at debian.org>
- Build-Depends: debhelper (>= 9), po-debconf,
- dpkg-dev (>= 1.16.1~), autotools-dev, dh-autoreconf, autoconf2.13,
- flex, bison, rdfind, libgeos-dev (>= 3.3),
- libjson-c-dev | libjson0-dev (>= 0.9~), libsfcgal-dev [!armel],
- libproj-dev (>= 4.6.0), xsltproc, docbook, docbook-xsl,
- imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
- libgtk2.0-dev, libgdal-dev (>= 1.11.2+dfsg-3~) | libgdal1-dev (>= 1.9.0~),
- postgresql-server-dev-all, postgresql-common (>= 148~), postgresql
+ Build-Depends: autoconf2.13,
+ autotools-dev,
+ bison,
+ dblatex,
+ debhelper (>= 9),
+ dh-autoreconf,
+ docbook,
+ docbook-xsl,
+ dpkg-dev (>= 1.16.1~),
+ flex,
+ imagemagick,
+ libcunit1-dev,
+ libgdal-dev (>= 1.11.2+dfsg-3~) | libgdal1-dev (>= 1.9.0~),
+ libgeos-dev (>= 3.3),
+ libgtk2.0-dev,
+ libjson-c-dev | libjson0-dev (>= 0.9~),
+ libproj-dev (>= 4.6.0),
+ libsfcgal-dev [!armel],
+ libxml2-dev (>= 2.5.0~),
+ po-debconf,
+ postgresql,
+ postgresql-common (>= 148~),
+ postgresql-server-dev-all,
+ rdfind,
+ xsltproc
Standards-Version: 3.9.8
- Homepage: http://postgis.net/
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/postgis.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/postgis.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/postgis.git -b jessie-backports
+ Homepage: http://postgis.net/
Package: postgis
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: postgresql-9.4-postgis-2.3, postgis-doc
+ Depends: ${shlibs:Depends},
+ ${misc:Depends}
-Recommends: postgresql-9.6-postgis-2.3,
++Recommends: postgresql-9.4-postgis-2.3,
+ postgis-doc
Suggests: postgis-gui
Description: Geographic objects support for PostgreSQL
PostGIS adds support for geographic objects to the PostgreSQL
@@@ -35,8 -55,10 +55,10 @@@
Package: postgis-gui
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: postgresql-9.4-postgis-2.3, postgis-doc
+ Depends: ${shlibs:Depends},
+ ${misc:Depends}
-Recommends: postgresql-9.6-postgis-2.3,
++Recommends: postgresql-9.4-postgis-2.3,
+ postgis-doc
Suggests: postgis
Breaks: postgis (<< 2.2.2+dfsg-2~)
Replaces: postgis (<< 2.2.2+dfsg-2~)
@@@ -100,16 -123,16 +123,16 @@@ Description: PostGIS "Lightweight Geome
processing functions, are implemented here. This package contains
the development files.
-Package: postgresql-9.6-postgis-2.3
+Package: postgresql-9.4-postgis-2.3
- Depends: ${shlibs:Depends}, postgresql-9.4,
- liblwgeom-2.3-0,
- ${misc:Depends}
+ Architecture: any
-Depends: postgresql-9.6,
++Depends: postgresql-9.4,
+ ${shlibs:Depends},
+ ${misc:Depends}
-Recommends: postgresql-9.6-postgis-2.3-scripts,
- postgresql-contrib-9.6
+Recommends: postgresql-9.4-postgis-2.3-scripts,
- postgresql-contrib-9.4
++ postgresql-contrib-9.4
Suggests: postgis
Breaks: postgis (<< 1.2.1)
- Architecture: any
-Description: Geographic objects support for PostgreSQL 9.6
+Description: Geographic objects support for PostgreSQL 9.4
PostGIS adds support for geographic objects to the PostgreSQL
object-relational database. In effect, PostGIS "spatially enables"
the PostgreSQL server, allowing it to be used as a backend spatial
@@@ -117,16 -140,17 +140,17 @@@
SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
"Simple Features Specification for SQL".
.
- This package supports PostgreSQL 9.6.
+ This package supports PostgreSQL 9.4.
-Package: postgresql-9.6-postgis-2.3-scripts
+Package: postgresql-9.4-postgis-2.3-scripts
Architecture: all
- Depends: ${misc:Depends}
+ Depends: ${perl:Depends},
+ ${misc:Depends}
-Recommends: postgresql-9.6-postgis-2.3
-Breaks: postgresql-9.6-postgis-scripts (<< 2.2.2+dfsg-3~)
-Conflicts: postgresql-9.6-postgis-2.2-scripts
-Replaces: postgresql-9.6-postgis-scripts (<< 2.2.2+dfsg-3~)
-Description: Geographic objects support for PostgreSQL 9.6 -- scripts
+Recommends: postgresql-9.4-postgis-2.3
+Breaks: postgresql-9.4-postgis-scripts (<< 2.2.2+dfsg-3~)
+Conflicts: postgresql-9.4-postgis-2.2-scripts
+Replaces: postgresql-9.4-postgis-scripts (<< 2.2.2+dfsg-3~)
+Description: Geographic objects support for PostgreSQL 9.4 -- scripts
PostGIS adds support for geographic objects to the PostgreSQL
object-relational database. In effect, PostGIS "spatially enables"
the PostgreSQL server, allowing it to be used as a backend spatial
@@@ -135,13 -159,14 +159,14 @@@
"Simple Features Specification for SQL".
.
This package contains SQL scripts to upgrade from earlier PostGIS
- versions for PostgreSQL 9.6 as well as Perl utility scripts.
+ versions for PostgreSQL 9.4 as well as Perl utility scripts.
-Package: postgresql-9.6-postgis-scripts
+Package: postgresql-9.4-postgis-scripts
Architecture: all
- Depends: postgresql-9.4-postgis-2.3-scripts, ${misc:Depends}
- Priority: extra
Section: oldlibs
+ Priority: extra
-Depends: postgresql-9.6-postgis-2.3-scripts,
++Depends: postgresql-9.4-postgis-2.3-scripts,
+ ${misc:Depends}
Description: transitional dummy package
This is a transitional dummy package. It can safely be removed.
diff --cc debian/control.in
index 314f24a,4d92bef..82ae7c9
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,22 -1,40 +1,40 @@@
Source: postgis
+ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+ Uploaders: Stephen Frost <sfrost at debian.org>,
+ Francesco Paolo Lovergine <frankie at debian.org>,
+ Markus Wanner <markus at bluegap.ch>,
+ Bas Couwenberg <sebastic at debian.org>
Section: misc
Priority: optional
- Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
- Uploaders: Stephen Frost <sfrost at debian.org>, Francesco Paolo
- Lovergine <frankie at debian.org>, Markus Wanner <markus at bluegap.ch>,
- Bas Couwenberg <sebastic at debian.org>
- Build-Depends: debhelper (>= 9), po-debconf,
- dpkg-dev (>= 1.16.1~), autotools-dev, dh-autoreconf, autoconf2.13,
- flex, bison, rdfind, libgeos-dev (>= 3.3),
- libjson-c-dev | libjson0-dev (>= 0.9~), libsfcgal-dev [!armel],
- libproj-dev (>= 4.6.0), xsltproc, docbook, docbook-xsl,
- imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
- libgtk2.0-dev, libgdal-dev (>= 1.11.2+dfsg-3~) | libgdal1-dev (>= 1.9.0~),
- postgresql-server-dev-all, postgresql-common (>= 148~), postgresql
+ Build-Depends: autoconf2.13,
+ autotools-dev,
+ bison,
+ dblatex,
+ debhelper (>= 9),
+ dh-autoreconf,
+ docbook,
+ docbook-xsl,
+ dpkg-dev (>= 1.16.1~),
+ flex,
+ imagemagick,
+ libcunit1-dev,
+ libgdal-dev (>= 1.11.2+dfsg-3~) | libgdal1-dev (>= 1.9.0~),
+ libgeos-dev (>= 3.3),
+ libgtk2.0-dev,
+ libjson-c-dev | libjson0-dev (>= 0.9~),
+ libproj-dev (>= 4.6.0),
+ libsfcgal-dev [!armel],
+ libxml2-dev (>= 2.5.0~),
+ po-debconf,
+ postgresql,
+ postgresql-common (>= 148~),
+ postgresql-server-dev-all,
+ rdfind,
+ xsltproc
Standards-Version: 3.9.8
- Homepage: http://postgis.net/
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/postgis.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/postgis.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/postgis.git -b jessie-backports
+ Homepage: http://postgis.net/
Package: postgis
Architecture: any
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git
More information about the Pkg-grass-devel
mailing list