[Git][debian-gis-team/libgeotiff][master] 3 commits: Add upstream patch to fix FTBFS with PROJ 9.3. (closes: #1050775)

[Bas Couwenberg (@sebastic)]

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


Commits:
c39a77a4 by Bas Couwenberg at 2023-08-31T18:02:28+02:00
Add upstream patch to fix FTBFS with PROJ 9.3. (closes: #1050775)

- - - - -
728d92cc by Bas Couwenberg at 2023-08-31T18:09:48+02:00
Update lintian overrides.

- - - - -
4d39fd92 by Bas Couwenberg at 2023-08-31T18:09:48+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- − debian/libgeotiff5.lintian-overrides
- + debian/patches/pr90-PROJ-9.3.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,12 +1,15 @@
-libgeotiff (1.7.1-3) UNRELEASED; urgency=medium
+libgeotiff (1.7.1-3) unstable; urgency=medium
 
   * Bump Standards-Version to 4.6.2, no changes.
   * Bump debhelper compat to 13.
   * Use not-installed file instead of dh_install override.
   * Enable Salsa CI.
   * Add autopkgtest using upstream test scripts.
+  * Add upstream patch to fix FTBFS with PROJ 9.3.
+    (closes: #1050775)
+  * Update lintian overrides.
 
- -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Jan 2023 17:00:49 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 31 Aug 2023 18:06:14 +0200
 
 libgeotiff (1.7.1-2) unstable; urgency=medium
 


=====================================
debian/libgeotiff5.lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# False positive, string not included in source
-spelling-error-in-binary wTH with *
-


=====================================
debian/patches/pr90-PROJ-9.3.patch
=====================================
@@ -0,0 +1,34 @@
+Description: Fix 'make check' to pass with PROJ 9.3
+Author: Even Rouault <even.rouault at spatialys.com>
+Origin: https://github.com/OSGeo/libgeotiff/pull/90
+Bug: https://github.com/OSGeo/libgeotiff/issues/89
+
+--- a/test/testlistgeo
++++ b/test/testlistgeo
+@@ -218,14 +218,24 @@ echo "" >>${OUT}
+ sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp
+ mv ${OUT}.tmp ${OUT}
+ 
+-sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.tmp
++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
++mv ${OUT}.tmp ${OUT}
++sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < ${OUT} > ${OUT}.tmp
++mv ${OUT}.tmp ${OUT}
++
++sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp
++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized
++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
+ 
+ # do 'diff' with distribution results
+ # after cleaning for avoid spurios result due 
+ # to different build dir
+ sed -e "s/Testing listgeo .*test/Testing listgeo ..\/test/"  -i ${OUT}
+ echo "diff ${OUT} with testlistgeo_out.dist"
+-diff -u ${OUT} testlistgeo_out.dist.tmp
++diff -u ${OUT} testlistgeo_out.dist.normalized
+ if [ $? -ne 0 ] ; then
+     echo  ""
+     echo "PROBLEMS HAVE OCCURRED"


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



View it on GitLab: https://salsa.debian.org/debian-gis-team/libgeotiff/-/compare/6f4aade56eb8f2ecc0928d5bc28523e9fb3af3ea...4d39fd92691237f9654912baa647485ebf4611af

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/libgeotiff/-/compare/6f4aade56eb8f2ecc0928d5bc28523e9fb3af3ea...4d39fd92691237f9654912baa647485ebf4611af
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/20230831/56be2c8f/attachment-0001.htm>