[postgis] 01/01: Add patch avoid-bashisms.patch to fix the generated sql files.
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Wed Mar 22 12:22:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
markus_wanner-guest pushed a commit to branch master
in repository postgis.
commit a526c31f4bc1fca411b460030389b4319ce37cf7
Author: Markus Wanner <markus at bluegap.ch>
Date: Wed Mar 22 13:19:23 2017 +0100
Add patch avoid-bashisms.patch to fix the generated sql files.
Fixes pgapt issue #2279.
---
debian/changelog | 6 ++++++
debian/patches/avoid-bashisms.patch | 37 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 44 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 10a2c7d..1bc37f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgis (2.3.2+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+ * Add patch avoid-bashisms.patch to fix the generated sql files.
+
+ -- Markus Wanner <markus at bluegap.ch> Wed, 22 Mar 2017 13:16:33 +0100
+
postgis (2.3.2+dfsg-1~exp1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/patches/avoid-bashisms.patch b/debian/patches/avoid-bashisms.patch
new file mode 100644
index 0000000..c35af64
--- /dev/null
+++ b/debian/patches/avoid-bashisms.patch
@@ -0,0 +1,37 @@
+Description: Avoid a few bashisms resulting in invalid SQL files
+ An echo that's supposed to output a backslash works with bash, but not
+ in dash. Use printf, instead.
+Author: Markus Wanner <markus at bluegap.ch>
+Forwarded: no
+
+--- a/extensions/postgis/Makefile.in
++++ b/extensions/postgis/Makefile.in
+@@ -39,7 +39,7 @@
+
+ sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/spatial_ref_sys_config_dump.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql
+ mkdir -p sql
+- echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
++ printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
+ cat $^ >> $@
+
+ sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
+@@ -94,7 +94,7 @@
+
+ #postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster
+ sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
+- echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
++ printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
+ cat $^ >> $@
+
+ sql_minor_upgrade: sql_bits/postgis_extension_upgrade_minor.sql
+--- a/extensions/postgis_sfcgal/Makefile.in
++++ b/extensions/postgis_sfcgal/Makefile.in
+@@ -74,7 +74,7 @@
+
+ sql_bits/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/sfcgal_upgrade.sql ../../doc/sfcgal_comments.sql ../postgis_extension_helper_uninstall.sql
+ mkdir -p sql_bits
+- echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
++ printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
+ cat $^ >> $@
+
+ sql_minor_upgrade: sql_bits/sfcgal_upgrade_minor.sql
diff --git a/debian/patches/series b/debian/patches/series
index 32f6ef4..aee2e6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+avoid-bashisms.patch
link-liblwgeom
relax-test-timing-constraints.patch
--
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