[postgis] 07/11: Drop avoid-bashisms.patch, applied upstream.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository postgis.

commit e9e9387a798966ef87b9c0d20b305e7aaa2bc0ac
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 2 20:27:20 2017 +0200

    Drop avoid-bashisms.patch, applied upstream.
---
 debian/changelog                    |  1 +
 debian/patches/avoid-bashisms.patch | 37 -------------------------------------
 debian/patches/link-liblwgeom       |  2 +-
 debian/patches/series               |  1 -
 4 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28b8100..1297eb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ postgis (2.4.0~beta1+dfsg-1) UNRELEASED; urgency=medium
     - Add license & copyright for uthash.h
     - Change license shortname from MIT to Expat
   * Rename packages for new PostGIS minor version (2.3 -> 2.4).
+  * Drop avoid-bashisms.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Sep 2017 19:56:21 +0200
 
diff --git a/debian/patches/avoid-bashisms.patch b/debian/patches/avoid-bashisms.patch
deleted file mode 100644
index d98d9c0..0000000
--- a/debian/patches/avoid-bashisms.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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: yes, https://lists.osgeo.org/pipermail/postgis-devel/2017-March/026135.html
-
---- a/extensions/postgis/Makefile.in
-+++ b/extensions/postgis/Makefile.in
-@@ -39,7 +39,7 @@ all: sql/$(EXTENSION)--$(EXTVERSION).sql
- 
- 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 @@ sql_bits/raster_comments.sql: ../../doc/
- 
- #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.sql : ../../post
- 
- 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/link-liblwgeom b/debian/patches/link-liblwgeom
index 2580d29..4f5f510 100644
--- a/debian/patches/link-liblwgeom
+++ b/debian/patches/link-liblwgeom
@@ -6,7 +6,7 @@ Forwarded: https://trac.osgeo.org/postgis/ticket/3290
 
 --- a/postgis/Makefile.in
 +++ b/postgis/Makefile.in
-@@ -102,15 +102,9 @@ PG_OBJS= \
+@@ -112,15 +112,9 @@ PG_OBJS= \
  OBJS=$(PG_OBJS)
  
  # Libraries to link into the module (proj, geos)
diff --git a/debian/patches/series b/debian/patches/series
index aee2e6a..32f6ef4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-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