[Git][debian-gis-team/libgeotiff][master] 2 commits: Add patch to fix FTBFS with PROJ 9.3.1.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / libgeotiff


Commits:
41851707 by Bas Couwenberg at 2023-12-01T08:25:33+01:00
Add patch to fix FTBFS with PROJ 9.3.1.

- - - - -
b2fd3186 by Bas Couwenberg at 2023-12-01T08:25:49+01:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/proj-9.3.1.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,10 @@
-libgeotiff (1.7.1-4) UNRELEASED; urgency=medium
+libgeotiff (1.7.1-4) unstable; urgency=medium
 
   * Update upstream patch to fix FTBFS with PROJ 9.3.
   * Use `set -e` in autopkgtest script.
+  * Add patch to fix FTBFS with PROJ 9.3.1.
 
- -- Bas Couwenberg <sebastic at debian.org>  Thu, 31 Aug 2023 18:46:19 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 01 Dec 2023 08:25:36 +0100
 
 libgeotiff (1.7.1-3) unstable; urgency=medium
 


=====================================
debian/patches/proj-9.3.1.patch
=====================================
@@ -0,0 +1,30 @@
+Description: Fix test failure with PROJ 9.3.1.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/OSGeo/libgeotiff/pull/105
+
+--- a/test/testlistgeo
++++ b/test/testlistgeo
+@@ -218,6 +218,11 @@ echo "" >>${OUT}
+ sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp
+ mv ${OUT}.tmp ${OUT}
+ 
++sed "s/Projection = 15914 (BLM zone 14N (US survey .*))/Projection = 15914 (BLM zone 14N)/g" < ${OUT} > ${OUT}.tmp
++mv ${OUT}.tmp ${OUT}
++sed "s/Projection = 6753 (Oregon Columbia River West zone (.*))/Projection = 6753 (Oregon Columbia River West zone)/" < ${OUT} > ${OUT}.tmp
++mv ${OUT}.tmp ${OUT}
++
+ sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.normalized
+ 
+ sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < ${OUT} > ${OUT}.tmp
+@@ -230,6 +235,11 @@ mv testlistgeo_out.dist.normalized.tmp t
+ sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp
+ mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized
+ 
++sed "s/Projection = 15914 (BLM zone 14N (US survey .*))/Projection = 15914 (BLM zone 14N)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp
++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized
++sed "s/Projection = 6753 (Oregon Columbia River West zone (.*))/Projection = 6753 (Oregon Columbia River West zone)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp
++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized
++
+ # do 'diff' with distribution results
+ # after cleaning for avoid spurios result due 
+ # to different build dir


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 pr82-Fix-test-failures-with-PROJ-9.1.1.patch
 pr90-PROJ-9.3.patch
+proj-9.3.1.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/libgeotiff/-/compare/743626775172be0f8d5baadbcd224a7e73734fa7...b2fd3186e8bf8347f901d4a67944a0f994fca921

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/libgeotiff/-/compare/743626775172be0f8d5baadbcd224a7e73734fa7...b2fd3186e8bf8347f901d4a67944a0f994fca921
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/20231201/b23b7cb9/attachment-0001.htm>