Bas Couwenberg pushed to branch master at Debian GIS Project / postgis
Commits: 38da640b by Bas Couwenberg at 2021-10-08T14:34:04+02:00 Bump debhelper compat to 12. Changes: - Drop --list-missing from dh_install - - - - - 07e3ea3d by Bas Couwenberg at 2021-10-08T14:34:53+02:00 Drop pie rules for xenial. - - - - - e817a663 by Bas Couwenberg at 2021-10-08T14:35:35+02:00 Add pkg-config to build dependencies. - - - - - cc0a5b27 by Bas Couwenberg at 2021-10-08T14:36:16+02:00 Update packaging for postgresql-14. - - - - - 6d4e3516 by Bas Couwenberg at 2021-10-08T14:37:12+02:00 Add upstream patch to fix missing the INSERT statements. - - - - - cd1fd491 by Bas Couwenberg at 2021-10-08T14:38:10+02:00 Set distribution to unstable. - - - - - 7 changed files: - debian/changelog - − debian/compat - debian/control - debian/control.in - + debian/patches/0001-Revert-Harmonize-with-old-behaviour.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,14 @@ -postgis (3.1.4+dfsg-2) UNRELEASED; urgency=medium +postgis (3.1.4+dfsg-2) unstable; urgency=medium * Bump Standards-Version to 4.6.0, no changes. - - -- Bas Couwenberg <[email protected]> Wed, 08 Sep 2021 17:38:19 +0200 + * Bump debhelper compat to 12, changes: + - Drop --list-missing from dh_install + * Drop pie rules for xenial. + * Add pkg-config to build dependencies. + * Update packaging for postgresql-14. + * Add upstream patch to fix missing the INSERT statements. + + -- Bas Couwenberg <[email protected]> Fri, 08 Oct 2021 14:37:17 +0200 postgis (3.1.4+dfsg-1) unstable; urgency=medium ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -10 ===================================== debian/control ===================================== @@ -10,7 +10,7 @@ Priority: optional Build-Depends: bison, dctrl-tools, dblatex, - debhelper (>= 10~), + debhelper-compat (= 12), docbook, docbook-xsl, dpkg-dev (>= 1.16.1~), @@ -26,6 +26,7 @@ Build-Depends: bison, libsfcgal-dev (>= 1.3.1) [!armel !armhf], libxml2-dev (>= 2.5.0~), lsb-release, + pkg-config, po-debconf, postgresql-all, postgresql-common (>= 148~), @@ -71,17 +72,17 @@ Description: Geographic objects support for PostgreSQL -- documentation . This package contains the PostGIS documentation. -Package: postgresql-13-postgis-3 +Package: postgresql-14-postgis-3 Architecture: any -Depends: postgresql-13, - postgresql-13-postgis-3-scripts, +Depends: postgresql-14, + postgresql-14-postgis-3-scripts, ${shlibs:Depends}, ${misc:Depends} Suggests: postgis Breaks: postgis (<< 1.2.1) -Provides: postgresql-13-postgis, +Provides: postgresql-14-postgis, postgresql-postgis -Description: Geographic objects support for PostgreSQL 13 +Description: Geographic objects support for PostgreSQL 14 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 @@ -89,16 +90,16 @@ Description: Geographic objects support for PostgreSQL 13 SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS "Simple Features Specification for SQL". -Package: postgresql-13-postgis-3-scripts +Package: postgresql-14-postgis-3-scripts Architecture: all Multi-Arch: foreign Depends: ${perl:Depends}, ${misc:Depends} -Recommends: postgresql-13-postgis-3 -Provides: postgresql-13-postgis-scripts, +Recommends: postgresql-14-postgis-3 +Provides: postgresql-14-postgis-scripts, postgresql-postgis-scripts -Replaces: postgresql-13-postgis-scripts (<< 2.2.2+dfsg-3~) -Description: Geographic objects support for PostgreSQL 13 -- SQL scripts +Replaces: postgresql-14-postgis-scripts (<< 2.2.2+dfsg-3~) +Description: Geographic objects support for PostgreSQL 14 -- SQL 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 @@ -107,4 +108,5 @@ Description: Geographic objects support for PostgreSQL 13 -- SQL scripts "Simple Features Specification for SQL". . This package contains the SQL scripts for installing PostGIS in a PostgreSQL - 13 database, and for upgrading from earlier PostGIS versions. + 14 database, and for upgrading from earlier PostGIS versions. + ===================================== debian/control.in ===================================== @@ -10,7 +10,7 @@ Priority: optional Build-Depends: bison, dctrl-tools, dblatex, - debhelper (>= 10~), + debhelper-compat (= 12), docbook, docbook-xsl, dpkg-dev (>= 1.16.1~), @@ -26,6 +26,7 @@ Build-Depends: bison, libsfcgal-dev (>= 1.3.1) [!armel !armhf], libxml2-dev (>= 2.5.0~), lsb-release, + pkg-config, po-debconf, postgresql-all, postgresql-common (>= 148~), ===================================== debian/patches/0001-Revert-Harmonize-with-old-behaviour.patch ===================================== @@ -0,0 +1,19 @@ +Description: Revert "Harmonize with old behaviour." + This reverts commit 595f840ebc479657adac9143cfaf890faba72f99. + . + Fixes #4994 in 3.1 branch (3.1.5dev) +Author: Sandro Santilli <[email protected]> +Origin: https://trac.osgeo.org/postgis/changeset/7b58a4644dc0d4b9ebedfd33d4e3f9fc717ad211/git +Bug: https://trac.osgeo.org/postgis/ticket/4994 + +--- a/loader/dbfopen.c ++++ b/loader/dbfopen.c +@@ -1750,7 +1750,7 @@ int SHPAPI_CALL DBFIsRecordDeleted( DBFH + /* -------------------------------------------------------------------- */ + /* Have we read the record? */ + /* -------------------------------------------------------------------- */ +- if( psDBF->nRecords > 0 && !DBFLoadRecord( psDBF, iShape ) ) ++ if( !DBFLoadRecord( psDBF, iShape ) ) + return FALSE; + + /* -------------------------------------------------------------------- */ ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ relax-test-timing-constraints.patch chaikin incorrect-path-for-interpreter.patch +0001-Revert-Harmonize-with-old-behaviour.patch ===================================== debian/rules ===================================== @@ -13,16 +13,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all # Don't fail when d/control doesn't match template export PG_UPDATECONTROL=yes -# Disable PIE on Ubuntu xenial (causes "undefined reference to symbol 'roundf@@GLIBC_2.2.5'") -VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes) -DISTRIBUTION_RELEASE := $(shell lsb_release -cs) - -ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes) - ifneq (,$(filter $(DISTRIBUTION_RELEASE),xenial)) - export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie - endif -endif - include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/pkg-info.mk include /usr/share/postgresql-common/pgxs_debian_control.mk @@ -247,7 +237,7 @@ override_dh_install: $(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 --list-missing + dh_install override_dh_makeshlibs: dh_makeshlibs -Xusr/lib/postgis -- -v$(UPSTREAM_VERSION) View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/6b6995b396aaa18c0428d0b7da7327453eeaab05...cd1fd4914f3517539f9bc6892b4815cdac1071bd -- View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/6b6995b396aaa18c0428d0b7da7327453eeaab05...cd1fd4914f3517539f9bc6892b4815cdac1071bd You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
