Bas Couwenberg pushed to branch experimental at Debian GIS Project / proj
Commits: f9280c8f by Bas Couwenberg at 2020-06-24T11:40:03+02:00 Add upstream patch to fix FTBFS on arm* & mipsel. - - - - - 21aeef12 by Bas Couwenberg at 2020-06-24T11:41:32+02:00 Update symbols for other architectures. - - - - - c2bee715 by Bas Couwenberg at 2020-06-24T11:41:45+02:00 Set distribution to experimental. - - - - - 4 changed files: - debian/changelog - debian/libproj19.symbols - + debian/patches/0001-test_defmodel.cpp-increase-comparison-tolerance-for-.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +proj (7.1.0~rc1-1~exp2) experimental; urgency=medium + + * Add upstream patch to fix FTBFS on arm* & mipsel. + * Update symbols for other architectures. + + -- Bas Couwenberg <[email protected]> Wed, 24 Jun 2020 11:41:34 +0200 + proj (7.1.0~rc1-1~exp1) experimental; urgency=medium * New upstream release candidate. ===================================== debian/libproj19.symbols ===================================== @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 7.1.0~rc1 amd64 +# SymbolsHelper-Confirmed: 7.1.0~rc1 amd64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32 libproj.so.19 #PACKAGE# #MINVER# * Build-Depends-Package: libproj-dev _Z10pj_ell_setP9projCtx_tP8ARG_listPdS3_@Base 6.0.0 @@ -26,8 +26,12 @@ libproj.so.19 #PACKAGE# #MINVER# _Z8pj_paramP9projCtx_tP8ARG_listPKc@Base 6.0.0 _Z9pj_shrinkPc@Base 6.0.0 _ZL21approx_e_fwd_internal5PJ_LPP8PJconsts._GLOBAL___projections_tmerc.cpp_FB5499C7_0x31c32e46ecd103d0.ifunc@Base 7.1.0~rc1 + (arch=amd64)_ZL21approx_e_fwd_internal5PJ_LPP8PJconsts._GLOBAL___projections_tmerc.cpp_FB5499C7_0x45b0687a6de935a2.ifunc@Base 7.1.0~rc1 + (arch=x32)_ZL21approx_e_fwd_internal5PJ_LPP8PJconsts._GLOBAL___projections_tmerc.cpp_FB5499C7_0x5042a3fe6360d77f.ifunc@Base 7.1.0~rc1 _ZL21approx_e_fwd_internal5PJ_LPP8PJconsts._GLOBAL___projections_tmerc.cpp_FB5499C7_0xa7a243b4735ed706.ifunc@Base 7.1.0~rc1 _ZL21approx_e_inv_internal5PJ_XYP8PJconsts._GLOBAL___projections_tmerc.cpp_FB5499C7_0x31c32e46ecd103d0.ifunc@Base 7.1.0~rc1 + (arch=amd64)_ZL21approx_e_inv_internal5PJ_XYP8PJconsts._GLOBAL___projections_tmerc.cpp_FB5499C7_0x45b0687a6de935a2.ifunc@Base 7.1.0~rc1 + (arch=x32)_ZL21approx_e_inv_internal5PJ_XYP8PJconsts._GLOBAL___projections_tmerc.cpp_FB5499C7_0x5042a3fe6360d77f.ifunc@Base 7.1.0~rc1 _ZL21approx_e_inv_internal5PJ_XYP8PJconsts._GLOBAL___projections_tmerc.cpp_FB5499C7_0xa7a243b4735ed706.ifunc@Base 7.1.0~rc1 _ZN5osgeo4proj11FileManager4openEP9projCtx_tPKcNS0_10FileAccessE@Base 7.0.0 _ZN5osgeo4proj11FileManager6existsEP9projCtx_tPKc@Base 7.0.0 @@ -380,7 +384,7 @@ libproj.so.19 #PACKAGE# #MINVER# _ZN5osgeo4proj3crs9SingleCRSD1Ev@Base 6.0.0 _ZN5osgeo4proj3crs9SingleCRSD2Ev@Base 6.0.0 (arch=!amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN5osgeo4proj4File9read_lineB5cxx11EjRbS2_@Base 7.0.0 - (arch=amd64 arm64 ia64 ppc64el sparc64)_ZN5osgeo4proj4File9read_lineB5cxx11EmRbS2_@Base 7.0.1 + (arch=amd64 arm64 ia64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZN5osgeo4proj4File9read_lineB5cxx11EmRbS2_@Base 7.1.0~rc1 _ZN5osgeo4proj4FileD0Ev@Base 7.0.0 _ZN5osgeo4proj4FileD1Ev@Base 7.0.0 _ZN5osgeo4proj4FileD2Ev@Base 7.0.0 @@ -1162,8 +1166,8 @@ libproj.so.19 #PACKAGE# #MINVER# (optional=templinst|arch=!armel !riscv64)_ZNSt12__shared_ptrIN5osgeo4proj3crs11GeodeticCRSELN9__gnu_cxx12_Lock_policyE2EEC2ERKS6_@Base 6.2.0 (optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj3crs13GeographicCRSELN9__gnu_cxx12_Lock_policyE1EEC1ERKS6_@Base 7.0.1 (optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj3crs13GeographicCRSELN9__gnu_cxx12_Lock_policyE1EEC2ERKS6_@Base 7.0.1 - (optional=templinst)_ZNSt12__shared_ptrIN5osgeo4proj3crs13GeographicCRSELN9__gnu_cxx12_Lock_policyE2EEC1ERKS6_@Base 7.0.1 - (optional=templinst)_ZNSt12__shared_ptrIN5osgeo4proj3crs13GeographicCRSELN9__gnu_cxx12_Lock_policyE2EEC2ERKS6_@Base 7.0.1 + (optional=templinst|arch=!riscv64)_ZNSt12__shared_ptrIN5osgeo4proj3crs13GeographicCRSELN9__gnu_cxx12_Lock_policyE2EEC1ERKS6_@Base 7.0.1 + (optional=templinst|arch=!riscv64)_ZNSt12__shared_ptrIN5osgeo4proj3crs13GeographicCRSELN9__gnu_cxx12_Lock_policyE2EEC2ERKS6_@Base 7.0.1 (optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj3crs3CRSELN9__gnu_cxx12_Lock_policyE1EEC1ERKS6_@Base 6.0.0 (optional=templinst|arch=armel riscv64)_ZNSt12__shared_ptrIN5osgeo4proj3crs3CRSELN9__gnu_cxx12_Lock_policyE1EEC1INS2_13GeographicCRSEvEERKS_IT_LS5_1EE@Base 6.0.0 (optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj3crs3CRSELN9__gnu_cxx12_Lock_policyE1EEC2ERKS6_@Base 6.0.0 @@ -1184,8 +1188,8 @@ libproj.so.19 #PACKAGE# #MINVER# (optional=templinst|arch=!armel !riscv64)_ZNSt12__shared_ptrIN5osgeo4proj5datum9EllipsoidELN9__gnu_cxx12_Lock_policyE2EEC2ERKS6_@Base 6.2.0 (optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj6common16IdentifiedObjectELN9__gnu_cxx12_Lock_policyE1EEC1INS1_9operation15OperationMethodEvEERKS_IT_LS5_1EE@Base 7.0.0 (optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj6common16IdentifiedObjectELN9__gnu_cxx12_Lock_policyE1EEC2INS1_9operation15OperationMethodEvEERKS_IT_LS5_1EE@Base 7.0.0 - (optional=templinst|arch=!armel !riscv64)_ZNSt12__shared_ptrIN5osgeo4proj6common16IdentifiedObjectELN9__gnu_cxx12_Lock_policyE2EEC1INS1_9operation15OperationMethodEvEERKS_IT_LS5_2EE@Base 7.0.0 - (optional=templinst|arch=!armel !riscv64)_ZNSt12__shared_ptrIN5osgeo4proj6common16IdentifiedObjectELN9__gnu_cxx12_Lock_policyE2EEC2INS1_9operation15OperationMethodEvEERKS_IT_LS5_2EE@Base 7.0.0 + (optional=templinst|arch=!armel !mips64el !powerpc !ppc64 !ppc64el !riscv64 !s390x)_ZNSt12__shared_ptrIN5osgeo4proj6common16IdentifiedObjectELN9__gnu_cxx12_Lock_policyE2EEC1INS1_9operation15OperationMethodEvEERKS_IT_LS5_2EE@Base 7.0.0 + (optional=templinst|arch=!armel !mips64el !powerpc !ppc64 !ppc64el !riscv64 !s390x)_ZNSt12__shared_ptrIN5osgeo4proj6common16IdentifiedObjectELN9__gnu_cxx12_Lock_policyE2EEC2INS1_9operation15OperationMethodEvEERKS_IT_LS5_2EE@Base 7.0.0 (optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj9operation10ConversionELN9__gnu_cxx12_Lock_policyE1EEC1ERKS6_@Base 6.1.0 (optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj9operation10ConversionELN9__gnu_cxx12_Lock_policyE1EEC2ERKS6_@Base 6.1.0 (optional=templinst|arch=!armel !riscv64)_ZNSt12__shared_ptrIN5osgeo4proj9operation10ConversionELN9__gnu_cxx12_Lock_policyE2EEC1ERKS6_@Base 6.1.0 @@ -1200,8 +1204,10 @@ libproj.so.19 #PACKAGE# #MINVER# (optional=templinst|arch=!armel !riscv64)_ZNSt12__shared_ptrIN5osgeo4proj9operation14TransformationELN9__gnu_cxx12_Lock_policyE2EEC2ERKS6_@Base 6.0.0 (optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE1EEC1ERKS6_@Base 6.0.0 (optional=templinst|arch=armel riscv64)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE1EEC1INS2_10ConversionEvEERKS_IT_LS5_1EE@Base 6.0.0 + (optional=templinst|arch=riscv64)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE1EEC1INS2_14TransformationEvEERKS_IT_LS5_1EE@Base 7.1.0~rc1 (optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE1EEC2ERKS6_@Base 6.0.0 (optional=templinst|arch=armel riscv64)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE1EEC2INS2_10ConversionEvEERKS_IT_LS5_1EE@Base 6.0.0 + (optional=templinst|arch=riscv64)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE1EEC2INS2_14TransformationEvEERKS_IT_LS5_1EE@Base 7.1.0~rc1 (optional=templinst|arch=!armel !riscv64)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE2EEC1ERKS6_@Base 6.0.0 (optional=templinst|arch=!armel !riscv64)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE2EEC1INS2_10ConversionEvEERKS_IT_LS5_2EE@Base 6.0.0 (optional=templinst)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE2EEC1INS2_14TransformationEvEERKS_IT_LS5_2EE@Base 7.1.0~rc1 @@ -1889,7 +1895,7 @@ libproj.so.19 #PACKAGE# #MINVER# (optional=templinst|arch=!armel !riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE2EED0Ev@Base 7.0.0 (optional=templinst|arch=!armel !riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE2EED1Ev@Base 7.0.0 (optional=templinst|arch=!armel !riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE2EED2Ev@Base 7.0.0 - (optional=templinst|arch=alpha hurd-i386 i386 ia64 kfreebsd-i386 ppc64el sparc64)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKcSt4lessIS5_ESaISt4pairIKS5_S7_EEEixEOS5_@Base 6.2.0 + (optional=templinst|arch=alpha hurd-i386 i386 ia64 kfreebsd-i386 mips64el ppc64el sparc64)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKcSt4lessIS5_ESaISt4pairIKS5_S7_EEEixEOS5_@Base 6.2.0 (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St4lessIS5_ESaISt4pairIKS5_S5_EEEixERS9_@Base 6.2.0 (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEdSt4lessIS5_ESaISt4pairIKS5_dEEEixERS9_@Base 6.0.0 (optional=templinst)_ZNSt3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4lessIS5_ESaIS5_EED1Ev@Base 6.0.0 @@ -1940,7 +1946,7 @@ libproj.so.19 #PACKAGE# #MINVER# (optional=templinst)_ZNSt6vectorIdSaIdEEaSERKS1_@Base 6.0.0 (optional=templinst)_ZNSt6vectorIhSaIhEE13_M_assign_auxIPKhEEvT_S5_St20forward_iterator_tag@Base 7.0.0 (optional=templinst|arch=!amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIhSaIhEE17_M_default_appendEj@Base 7.0.0 - (optional=templinst|arch=amd64 arm64 ia64 ppc64el sparc64)_ZNSt6vectorIhSaIhEE17_M_default_appendEm@Base 7.0.0 + (optional=templinst|arch=amd64 arm64 ia64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIhSaIhEE17_M_default_appendEm@Base 7.0.0 (optional=templinst)_ZNSt6vectorIxSaIxEE17_M_realloc_insertIJxEEEvN9__gnu_cxx17__normal_iteratorIPxS1_EEDpOT_@Base 7.0.0 (optional=templinst)_ZNSt7__cxx1110_List_baseIN5osgeo4proj2io16AuthorityFactory7CRSInfoESaIS5_EE8_M_clearEv@Base 6.0.0 (optional=templinst)_ZNSt7__cxx1110_List_baseIN5osgeo4proj2io16AuthorityFactory8UnitInfoESaIS5_EE8_M_clearEv@Base 7.1.0~rc1 @@ -1954,6 +1960,7 @@ libproj.so.19 #PACKAGE# #MINVER# (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 7.0.1 (optional=templinst)_ZNSt7__cxx114listINS_12basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE18_M_assign_dispatchISt20_List_const_iteratorIS5_EEEvT_SB_St12__false_type@Base 6.3.0 (optional=templinst)_ZNSt7__cxx114listISt4pairINS_12basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EE12emplace_backIJS7_EEEvDpOT_@Base 7.1.0~rc1 + (optional=templinst|arch=s390x)_ZNSt7__cxx114listISt4pairINS_12basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EE9_M_insertIJS7_EEEvSt14_List_iteratorIS7_EDpOT_@Base 7.1.0~rc1 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE16_M_insert_uniqueIRKS5_EESt4pairISt17_Rb_tree_iteratorIS5_EbEOT_@Base 6.0.0 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE16_M_insert_uniqueIS5_EESt4pairISt17_Rb_tree_iteratorIS5_EbEOT_@Base 7.0.1 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE24_M_get_insert_unique_posERKS5_@Base 6.0.0 ===================================== debian/patches/0001-test_defmodel.cpp-increase-comparison-tolerance-for-.patch ===================================== @@ -0,0 +1,16 @@ +Description: test_defmodel.cpp: increase comparison tolerance for ARM and MIPS platforms (fixes #2271) +Author: Even Rouault <[email protected]> +Origin: https://github.com/OSGeo/PROJ/commit/7523645bae2295430b8a96a43ea87c2f345b62ea +Bug: https://github.com/OSGeo/PROJ/issues/2271 + +--- a/test/unit/test_defmodel.cpp ++++ b/test/unit/test_defmodel.cpp +@@ -1371,7 +1371,7 @@ TEST(defmodel, evaluator_horizontal_unit + DeltaLongLatToEastingNorthing(DegToRad(lat), newLon - DegToRad(lon), + newLat - DegToRad(lat), a, b, de, dn); + EXPECT_NEAR(de, tFactor * expected_de, 1e-10); +- EXPECT_NEAR(dn, tFactor * expected_dn, 1e-10); ++ EXPECT_NEAR(dn, tFactor * expected_dn, 1e-9); + EXPECT_NEAR(newZ - zVal, tFactor * 0.84, 1e-4); + } + } ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +0001-test_defmodel.cpp-increase-comparison-tolerance-for-.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/compare/8a5c62056d32e208ed5ecf03dc4bca8ad2e98f78...c2bee715a3cc90efaa8130ca5eb1506a9cc0c818 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/compare/8a5c62056d32e208ed5ecf03dc4bca8ad2e98f78...c2bee715a3cc90efaa8130ca5eb1506a9cc0c818 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
