[Git][debian-gis-team/postgis][experimental] Drop parallel patches, fixed upstream.
Bas Couwenberg
gitlab at salsa.debian.org
Tue Jul 10 16:35:01 BST 2018
Bas Couwenberg pushed to branch experimental at Debian GIS Project / postgis
Commits:
c69e4326 by Bas Couwenberg at 2018-07-10T17:34:50+02:00
Drop parallel patches, fixed upstream.
- - - - -
5 changed files:
- debian/changelog
- − debian/patches/parallel-extensions.patch
- − debian/patches/parallel-postgis.patch
- − debian/patches/parallel-postgis_tiger_geocoder.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ postgis (2.5.0~beta1+dfsg-1~exp2) UNRELEASED; urgency=medium
* Bump Standards-Version to 4.1.5, no changes.
* Skip tests on arm64 & ppc64el too.
+ * Drop parallel patches, fixed upstream.
-- Bas Couwenberg <sebastic at debian.org> Thu, 05 Jul 2018 10:52:41 +0200
=====================================
debian/patches/parallel-extensions.patch deleted
=====================================
--- a/debian/patches/parallel-extensions.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Fix parallel build of postgis_topology extension.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/postgis/ticket/4105
-
---- a/extensions/postgis_topology/Makefile.in
-+++ b/extensions/postgis_topology/Makefile.in
-@@ -61,12 +61,14 @@ sql/$(EXTENSION).sql: extlock.sql sql_bi
- #strip CREATE SCHEMA since we force extension
- # to create schema by setting schema to topology in control
- sql_bits/topology.sql: ../../topology/topology.sql
-+ mkdir -p sql_bits
- sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
-
- ../../doc/topology_comments.sql:
- $(MAKE) -C ../../doc comments
-
- sql_bits/topology_comments.sql: ../../doc/topology_comments.sql
-+ mkdir -p sql_bits
- cp $< $@
-
- sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../../utils/create_unpackaged.pl sql/$(EXTENSION)--ANY--$(EXTVERSION).sql Makefile
-@@ -88,6 +90,7 @@ sql/topology_upgrade.sql: ../../topolog
- sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
-
- sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
-+ mkdir -p sql
- cat $(EXTENSION_UPGRADE_SCRIPTS) > $@
-
- include ../upgrade-paths-rules.mk
---- a/extensions/address_standardizer/Makefile.in
-+++ b/extensions/address_standardizer/Makefile.in
-@@ -80,21 +80,26 @@ sql/%.sql: %.sql.in
-
- sql/address_standardizer-- at POSTGIS_LIB_VERSION@.sql: sql/address_standardizer_types.sql \
- sql/address_standardizer_functions.sql
-+ mkdir -p sql
- cat $^ > $@
-
- sql/address_standardizer.sql: sql/address_standardizer_types.sql \
- sql/address_standardizer_functions.sql
-+ mkdir -p sql
- cat $^ > $@
-
- sql/address_standardizer--1.0--$(EXTVERSION).sql: sql/address_standardizer_functions.sql
-+ mkdir -p sql
- cat $^ > $@
-
- # upgrade logic for us data extension (to go to next cludge for dev upgrading)
- sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/address_standardizer_functions.sql
-+ mkdir -p sql
- cat $^ > $@
-
- # upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
- sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/address_standardizer_functions.sql
-+ mkdir -p sql
- cat $^ > $@
-
- # build us data extension
-@@ -108,10 +113,12 @@ sql/$(EXTENSION)_data_us.sql: us_lex.sql
-
- # upgrade logic for us data extension (to go to next cludge for dev upgrading)
- sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
-+ mkdir -p sql
- cat $^ > $@
-
- # upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
- sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
-+ mkdir -p sql
- cat $^ > $@
-
- mk-st-regexp: mk-st-regexp.pl
=====================================
debian/patches/parallel-postgis.patch deleted
=====================================
--- a/debian/patches/parallel-postgis.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Description: Fix parallel build of postgis extension.
- FTBFS on i386: https://buildd.debian.org/status/fetch.php?pkg=postgis&arch=i386&ver=2.4.4%2Bdfsg-3&stamp=1528578814&file=log
- .
- cp: cannot create regular file 'sql_bits/postgis_comments.sql': No such file or directory
- /bin/sh: 1: cannot create sql_bits/spatial_ref_sys_config_dump.sql: Directory nonexistent
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/postgis/ticket/4105
-
---- a/extensions/postgis/Makefile.in
-+++ b/extensions/postgis/Makefile.in
-@@ -66,6 +66,7 @@ CURV_big=@POSTGIS_MAJOR_VERSION@@POSTGIS
- all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
-
- sql/$(EXTENSION).sql: $(EXTENSION_SCRIPTS) | sql
-+ mkdir -p sql
- printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
- cat $^ >> $@
-
-@@ -77,9 +78,11 @@ $(EXTENSION).control: $(EXTENSION).contr
- > $@
-
- sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql | sql
-+ mkdir -p sql
- cp $< $@
-
- sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) sql/$(EXTENSION)--ANY--$(EXTVERSION).sql ../../utils/create_unpackaged.pl Makefile | sql
-+ mkdir -p sql
- # Ensure version is correct
- cat sql/$(EXTENSION)--ANY--$(EXTVERSION).sql > $@
- cat $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) \
-@@ -99,35 +102,43 @@ sql_bits:
-
- #strip BEGIN/COMMIT since these are not allowed in extensions
- sql_bits/spatial_ref_sys.sql: ../../spatial_ref_sys.sql | sql_bits
-+ mkdir -p sql_bits
- $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
-
- #strip BEGIN/COMMIT since these are not allowed in extensions
- sql_bits/postgis.sql: ../../postgis/postgis_for_extension.sql | sql_bits
-+ mkdir -p sql_bits
- $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
-
- ../../doc/postgis_comments.sql:
- $(MAKE) -C ../../doc comments
-
- sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql | sql_bits
-+ mkdir -p sql_bits
- cp $< $@
-
- #strip BEGIN/COMMIT since these are not allowed in extensions
- sql_bits/rtpostgis.sql: ../../raster/rt_pg/rtpostgis_for_extension.sql | sql_bits
-+ mkdir -p sql_bits
- $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
-
- sql_bits/spatial_ref_sys_config_dump.sql: ../../spatial_ref_sys.sql ../../utils/create_spatial_ref_sys_config_dump.pl | sql_bits
-+ mkdir -p sql_bits
- $(PERL) ../../utils/create_spatial_ref_sys_config_dump.pl $< > $@
-
- sql_bits/rtpostgis_upgrade.sql: ../../raster/rt_pg/rtpostgis_upgrade_for_extension.sql | sql_bits
-+ mkdir -p sql_bits
- $(PERL) -pe "s/BEGIN\;//g ; s/COMMIT\;//g; s/^(DROP .*)\;/SELECT postgis_extension_drop_if_exists('$(EXTENSION)', '\1');\n\1\;/" $< > $@
-
- sql_bits/postgis_upgrade.sql: ../../postgis/postgis_upgrade_for_extension.sql | sql_bits
-+ mkdir -p sql_bits
- $(PERL) -pe "s/BEGIN\;//g ; s/COMMIT\;//g; s/^(DROP .*)\;/SELECT postgis_extension_drop_if_exists('$(EXTENSION)', '\1');\n\1\;/" $< > $@
-
- ../../doc/raster_comments.sql:
- $(MAKE) -C ../../doc comments
-
- sql_bits/raster_comments.sql: ../../doc/raster_comments.sql | sql_bits
-+ mkdir -p sql_bits
- cp $< $@
-
- #postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster
=====================================
debian/patches/parallel-postgis_tiger_geocoder.patch deleted
=====================================
--- a/debian/patches/parallel-postgis_tiger_geocoder.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Description: Fix parallel build of postgis_tiger_geocoder extension.
- FTBFS on armhf: https://buildd.debian.org/status/fetch.php?pkg=postgis&arch=armhf&ver=2.4.4%2Bdfsg-2&stamp=1528568683&raw=0
- .
- cannot create expected/test-pagc_normalize_address.out: Directory nonexistent
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/postgis/ticket/4105
-
---- a/extensions/postgis_tiger_geocoder/Makefile.in
-+++ b/extensions/postgis_tiger_geocoder/Makefile.in
-@@ -52,19 +52,24 @@ sql:
- mkdir -p $@
-
- sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql | sql
-+ mkdir -p sql
- cp $< $@
-
- expected/test-normalize_address.out: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/normalize_address_regress | expected
-+ mkdir -p expected
- cat $^ > $@
-
- expected/test-pagc_normalize_address.out: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress | expected
-+ mkdir -p expected
- cat $^ > $@
-
- ## adding \t .. to force output to be the same as what get in regular regress in tiger folder
- sql/test-normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/normalize_address_regress.sql | sql
-+ mkdir -p sql
- cat $^ > $@
-
- sql/test-upgrade.sql: | sql
-+ mkdir -p sql
- echo 'ALTER EXTENSION ${EXTENSION} UPDATE TO "$(EXTVERSION)next"' > $@
-
- %.control: %.control.in Makefile
-@@ -73,20 +78,25 @@ sql/test-upgrade.sql: | sql
- > $@
-
- expected/test-upgrade.out: sql/test-upgrade.sql | expected
-+ mkdir -p expected
- cp $< $@
-
- sql/test-pagc_normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql | sql
-+ mkdir -p sql
- cat $^ > $@
-
- sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql | sql
-+ mkdir -p sql
- cat $^ > $@
-
- sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/tiger_geocoder_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql | sql
-+ mkdir -p sql
- cat $^ > $@
- echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@
- cat ../postgis_extension_helper_uninstall.sql >> $@
-
- sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql | sql
-+ mkdir -p sql
- cp $< $@
-
- #strip BEGIN/COMMIT since these are not allowed in extensions
-@@ -124,6 +134,7 @@ sql_bits/tiger_geocoder_minor.sql.in: ..
- ../../extras/tiger_geocoder/geocode/geocode.sql \
- ../../extras/tiger_geocoder/geocode/reverse_geocode.sql \
- ../../extras/tiger_geocoder/geocode/census_tracts_functions.sql
-+ mkdir -p sql_bits
- cat $^ > $@
-
- #also remove tiger_data from extension if it is part of it so data gets backed up
-@@ -163,21 +174,25 @@ sql_bits/tiger_geocoder.sql.in: sql_bits
- ../../extras/tiger_geocoder/topology/tiger_topology_loader.sql \
- ../postgis_extension_helper.sql \
- sql_bits/add_search_path.sql
-+ mkdir -p sql_bits
- cat $^ > $@
- echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@
- cat ../postgis_extension_helper_uninstall.sql >> $@
-
- sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in
-+ mkdir -p sql_bits
- sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
- $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
-
- sql_bits/add_search_path.sql: sql_bits/add_search_path.sql.in
-+ mkdir -p sql_bits
- cp $< $@
-
- ../../doc/tiger_geocoder_comments.sql:
- $(MAKE) -C ../../doc comments
-
- sql_bits/tiger_geocoder_comments.sql: ../../doc/tiger_geocoder_comments.sql
-+ mkdir -p sql_bits
- cp $< $@
-
- #grep all lines that start with CREATE OR REPLACE FUNCTION, TRIGGER...
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
link-liblwgeom
relax-test-timing-constraints.patch
rt_gdalwarp.patch
-#parallel-postgis_tiger_geocoder.patch
-#parallel-postgis.patch
-#parallel-extensions.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/c69e4326ed9363bea55b3705b5640c94fdd910a3
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/c69e4326ed9363bea55b3705b5640c94fdd910a3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180710/301d44d8/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list