Bas Couwenberg pushed to branch experimental at Debian GIS Project / postgis
Commits: 9b247e03 by Bas Couwenberg at 2023-07-20T10:30:42+02:00 Replace install-upgrade-paths.patch with committed upstream changes. - - - - - 45b5c688 by Bas Couwenberg at 2023-07-20T10:30:54+02:00 Set distribution to experimental. - - - - - 2 changed files: - debian/changelog - debian/patches/install-upgrade-paths.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +postgis (3.4.0~beta1+dfsg-1~exp7) experimental; urgency=medium + + * Replace install-upgrade-paths.patch with committed upstream changes. + + -- Bas Couwenberg <[email protected]> Thu, 20 Jul 2023 10:30:44 +0200 + postgis (3.4.0~beta1+dfsg-1~exp6) experimental; urgency=medium * Add upstream patch to create installdirs before install-upgrade-paths. ===================================== debian/patches/install-upgrade-paths.patch ===================================== @@ -1,15 +1,57 @@ -Description: Fix postgis.pl failure. +Description: Improve robustness of install-upgrade-paths Makefile target + - Do not hide errors on install + - Improve comment + - Ensure target dir exists before installing to it Author: Sandro Santilli <[email protected]> +Origin: https://git.osgeo.org/gitea/postgis/postgis/commit/dc3b6d15396404abdfc61891c68f5eec0105ec0b Bug: https://trac.osgeo.org/postgis/ticket/5444 --- a/extensions/upgrade-paths-rules.mk +++ b/extensions/upgrade-paths-rules.mk -@@ -18,7 +18,7 @@ install: install-upgrade-paths - # ALTER EXTENSION postgis UPDATE TO 'ANY'; - # ALTER EXTENSION postgis UPDATE; +@@ -6,23 +6,24 @@ PG_SHAREDIR=$(shell $(PG_CONFIG) --share + + install: install-upgrade-paths + +-# The "next" lines are a cludge to allow upgrading between different +-# revisions of the same version # +-# TODO: drop the "next" lines, give users instruction to use: ++# Install <extension>--<curversion>--ANY.sql ++# and <extension>--ANY--<curversion>.sql ++# upgrade paths + # +-# SELECT postgis_extensions_upgrade(); ++# The <curversion>--ANY file will be a symlink ( or copy, ++# on systems not supporting symlinks ) to an empty upgrade template ++# file named <extension>--TEMPLATED--TO--ANY.sql and be overwritten ++# by any future versions of PostGIS, keeping the overall number of ++# upgrade paths down. + # +-# Or: ++# See https://trac.osgeo.org/postgis/ticket/5092 + # +-# ALTER EXTENSION postgis UPDATE TO 'ANY'; +-# ALTER EXTENSION postgis UPDATE; +-# -install-upgrade-paths: tag-as-any -+install-upgrade-paths: installdirs tag-as-any - tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \ - $(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \ - $(INSTALL_DATA) "sql/$(TAG_UPGRADE)" "$(EXTDIR)/$(TAG_UPGRADE)"; \ +- tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \ +- $(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \ +- $(INSTALL_DATA) "sql/$(TAG_UPGRADE)" "$(EXTDIR)/$(TAG_UPGRADE)"; \ +- ln -fs "$(TAG_UPGRADE)" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--ANY.sql; ++install-upgrade-paths: sql/$(TAG_UPGRADE) sql/$(EXTENSION)--ANY--$(EXTVERSION).sql ++ mkdir -p "$(EXTDIR)" ++ $(INSTALL_DATA) "sql/$(EXTENSION)--ANY--$(EXTVERSION).sql" "$(EXTDIR)/$(EXTENSION)--ANY--$(EXTVERSION).sql" ++ $(INSTALL_DATA) "sql/$(TAG_UPGRADE)" "$(EXTDIR)/$(TAG_UPGRADE)" ++ ln -fs "$(TAG_UPGRADE)" "$(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--ANY.sql" + + install-extension-upgrades-from-known-versions: + $(PERL) $(top_srcdir)/loader/postgis.pl \ +@@ -33,8 +34,6 @@ install-extension-upgrades-from-known-ve + + all: sql/$(TAG_UPGRADE) + +-tag-as-any: sql/$(TAG_UPGRADE) +- + sql/$(TAG_UPGRADE): $(MAKEFILE_LIST) | sql + echo '-- Just tag extension $(EXTENSION) version as "ANY"' > $@ + echo '-- Installed by $(EXTENSION) $(EXTVERSION)' >> $@ View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/83a578ef0f680e5cf1fd64d0144f2e8efda76b88...45b5c688a6591f578e0350143cf08dba02294475 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/83a578ef0f680e5cf1fd64d0144f2e8efda76b88...45b5c688a6591f578e0350143cf08dba02294475 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
