[Git][debian-gis-team/libgeotiff][master] 2 commits: Use upstream patch to fix test failure with PROJ 9.1.1.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sat Nov 26 12:54:02 GMT 2022
Bas Couwenberg pushed to branch master at Debian GIS Project / libgeotiff
Commits:
93976788 by Bas Couwenberg at 2022-11-26T13:43:52+01:00
Use upstream patch to fix test failure with PROJ 9.1.1.
- - - - -
c6680d5c by Bas Couwenberg at 2022-11-26T13:48:55+01:00
Update lintian overrides.
- - - - -
5 changed files:
- debian/changelog
- + debian/libgeotiff5.lintian-overrides
- + debian/patches/pr82-Fix-test-failures-with-PROJ-9.1.1.patch
- − debian/patches/proj-9.1.1.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -3,6 +3,7 @@ libgeotiff (1.7.1-2) UNRELEASED; urgency=medium
* Bump Standards-Version to 4.6.1, no changes.
* Drop obsolete dh_strip override, dbgsym migration complete.
* Add patch to fix FTBFS with PROJ 9.1.1.
+ * Update lintian overrides.
-- Bas Couwenberg <sebastic at debian.org> Tue, 21 Jun 2022 07:10:13 +0200
=====================================
debian/libgeotiff5.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# False positive, string not included in source
+spelling-error-in-binary wTH with *
+
=====================================
debian/patches/pr82-Fix-test-failures-with-PROJ-9.1.1.patch
=====================================
@@ -0,0 +1,87 @@
+Description listgeo: add a -no_corners option to avoid printing corner coordinates which might be PROJ version sensitive
+Author: Even Rouault <even.rouault at spatialys.com>
+Bug: https://github.com/OSGeo/libgeotiff/issues/81
+
+--- a/bin/listgeo.c
++++ b/bin/listgeo.c
+@@ -29,6 +29,7 @@ void Usage()
+ " -tfw: Generate a .tfw (ESRI TIFF World) file for the target file.\n"
+ " -proj4: Report PROJ.4 equivalent projection definition.\n"
+ " -no_norm: Don't report 'normalized' parameter values.\n"
++ " -no_corners: Don't report corner coordinates.\n"
+ " filename: Name of the GeoTIFF file to report on.\n" );
+
+ exit( 1 );
+@@ -42,6 +43,7 @@ int main(int argc, char *argv[])
+ int i, norm_print_flag = 1, proj4_print_flag = 0;
+ int tfw_flag = 0, inv_flag = 0, dec_flag = 0;
+ int st_test_flag = 0;
++ int corners = 1;
+
+ /*
+ * Handle command line options.
+@@ -50,6 +52,8 @@ int main(int argc, char *argv[])
+ {
+ if( strcmp(argv[i],"-no_norm") == 0 )
+ norm_print_flag = 0;
++ else if( strcmp(argv[i],"-no_corners") == 0 )
++ corners = 0;
+ else if( strcmp(argv[i],"-tfw") == 0 )
+ tfw_flag = 1;
+ else if( strcmp(argv[i],"-proj4") == 0 )
+@@ -130,7 +134,8 @@ int main(int argc, char *argv[])
+
+ TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &xsize );
+ TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &ysize );
+- GTIFPrintCorners( gtif, &defn, stdout, xsize, ysize, inv_flag, dec_flag );
++ if( corners )
++ GTIFPrintCorners( gtif, &defn, stdout, xsize, ysize, inv_flag, dec_flag );
+ }
+
+ }
+--- a/test/testlistgeo
++++ b/test/testlistgeo
+@@ -59,11 +59,11 @@ $EXE ${DATA_DIR}/ProjLinearUnitsGeoKey_9
+ echo "" >>${OUT}
+
+ echo "Testing listgeo ProjectedCSTypeGeoKey_28191_cassini_soldner.tif" >> ${OUT}
+-$EXE ${DATA_DIR}/ProjectedCSTypeGeoKey_28191_cassini_soldner.tif >>${OUT}
++$EXE -no_corners ${DATA_DIR}/ProjectedCSTypeGeoKey_28191_cassini_soldner.tif >>${OUT}
+ echo "" >>${OUT}
+
+ echo "Testing listgeo cassini_soldner.tif" >> ${OUT}
+-$EXE ${DATA_DIR}/cassini_soldner.tif >>${OUT}
++$EXE -no_corners ${DATA_DIR}/cassini_soldner.tif >>${OUT}
+ echo "" >>${OUT}
+
+ echo "Testing listgeo ProjectedCSTypeGeoKey_27200_new_zealand_mapping_grid.tif" >> ${OUT}
+--- a/test/testlistgeo_out.dist
++++ b/test/testlistgeo_out.dist
+@@ -299,13 +299,6 @@ Ellipsoid: 7010/Clarke 1880 (Benoit) (63
+ Prime Meridian: 8901/Greenwich (0.000000/ 0d 0' 0.00"E)
+ Projection Linear Units: 9001/metre (1.000000m)
+
+-Corner Coordinates:
+-Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.57"N)
+-Lower Left ( 440720.000, 3751260.000) ( 40d47'27.69"E, 64d13'27.64"N)
+-Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.40"N)
+-Lower Right ( 440780.000, 3751260.000) ( 40d47'32.12"E, 64d13'27.47"N)
+-Center ( 440750.000, 3751290.000) ( 40d47'30.10"E, 64d13'28.52"N)
+-
+ Testing listgeo cassini_soldner.tif
+ Geotiff_Information:
+ Version: 1
+@@ -348,13 +341,6 @@ Projection Method: CT_CassiniSoldner
+ ProjFalseNorthingGeoKey: 126867.909000 m
+ Projection Linear Units: 9001/metre (1.000000m)
+
+-Corner Coordinates:
+-Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.57"N)
+-Lower Left ( 440720.000, 3751260.000) ( 40d47'27.69"E, 64d13'27.64"N)
+-Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.40"N)
+-Lower Right ( 440780.000, 3751260.000) ( 40d47'32.12"E, 64d13'27.47"N)
+-Center ( 440750.000, 3751290.000) ( 40d47'30.10"E, 64d13'28.52"N)
+-
+ Testing listgeo ProjectedCSTypeGeoKey_27200_new_zealand_mapping_grid.tif
+ Geotiff_Information:
+ Version: 1
=====================================
debian/patches/proj-9.1.1.patch deleted
=====================================
@@ -1,30 +0,0 @@
-Description: Fix test failure with PROJ 9.1.1.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/OSGeo/libgeotiff/issues/81
-
---- a/test/testlistgeo_out.dist
-+++ b/test/testlistgeo_out.dist
-@@ -300,9 +300,9 @@ Prime Meridian: 8901/Greenwich (0.000000
- Projection Linear Units: 9001/metre (1.000000m)
-
- Corner Coordinates:
--Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.57"N)
-+Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.56"N)
- Lower Left ( 440720.000, 3751260.000) ( 40d47'27.69"E, 64d13'27.64"N)
--Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.40"N)
-+Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.39"N)
- Lower Right ( 440780.000, 3751260.000) ( 40d47'32.12"E, 64d13'27.47"N)
- Center ( 440750.000, 3751290.000) ( 40d47'30.10"E, 64d13'28.52"N)
-
-@@ -349,9 +349,9 @@ Projection Method: CT_CassiniSoldner
- Projection Linear Units: 9001/metre (1.000000m)
-
- Corner Coordinates:
--Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.57"N)
-+Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.56"N)
- Lower Left ( 440720.000, 3751260.000) ( 40d47'27.69"E, 64d13'27.64"N)
--Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.40"N)
-+Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.39"N)
- Lower Right ( 440780.000, 3751260.000) ( 40d47'32.12"E, 64d13'27.47"N)
- Center ( 440750.000, 3751290.000) ( 40d47'30.10"E, 64d13'28.52"N)
-
=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-proj-9.1.1.patch
+pr82-Fix-test-failures-with-PROJ-9.1.1.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/libgeotiff/-/compare/fcc8abdb2e09f4c5b7e04f21c5b14b021c62f5ae...c6680d5c84bc7437b87b83ca085e844d99359af3
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/libgeotiff/-/compare/fcc8abdb2e09f4c5b7e04f21c5b14b021c62f5ae...c6680d5c84bc7437b87b83ca085e844d99359af3
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/20221126/9222cf37/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list