[Git][debian-gis-team/proj][experimental] 6 commits: New upstream version 8.0.0~rc2
Bas Couwenberg
gitlab at salsa.debian.org
Thu Feb 25 19:27:49 GMT 2021
Bas Couwenberg pushed to branch experimental at Debian GIS Project / proj
Commits:
42c704c3 by Bas Couwenberg at 2021-02-25T19:54:14+01:00
New upstream version 8.0.0~rc2
- - - - -
d2f30210 by Bas Couwenberg at 2021-02-25T19:54:44+01:00
Update upstream source from tag 'upstream/8.0.0_rc2'
Update to upstream version '8.0.0~rc2'
with Debian dir 5e0671341703d9f6f6a1dcd2ec163a2018516bf6
- - - - -
72ad8f05 by Bas Couwenberg at 2021-02-25T19:56:05+01:00
New upstream release candidate.
- - - - -
9a3f74ce by Bas Couwenberg at 2021-02-25T19:58:18+01:00
Update 8.0.0~rc1 symbols for other architectures.
- - - - -
0a4572a2 by Bas Couwenberg at 2021-02-25T19:58:45+01:00
Drop spelling-errors.patch, applied upstream.
- - - - -
2cd14ab7 by Bas Couwenberg at 2021-02-25T19:58:58+01:00
Set distribution to experimental.
- - - - -
11 changed files:
- CMakeLists.txt
- NEWS
- cmake/ProjInstallPath.cmake
- cmake/ProjUtilities.cmake
- debian/changelog
- debian/libproj22.symbols
- − debian/patches/series
- − debian/patches/spelling-errors.patch
- include/proj/internal/io_internal.hpp
- src/iso19111/metadata.cpp
- test/unit/test_metadata.cpp
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -282,3 +282,14 @@ endif()
set(docfiles COPYING NEWS AUTHORS)
install(FILES ${docfiles}
DESTINATION "${DOCDIR}")
+
+################################################################################
+# pkg-config support
+################################################################################
+if(UNIX OR MINGW)
+ configure_proj_pc()
+
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/proj.pc
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+endif()
=====================================
NEWS
=====================================
@@ -55,7 +55,7 @@ tweaks in the underlying API.
o Update to EPSG v10.015 (#2539)
- o Default log level set to PJ_LOG_ERROR #2542)
+ o Default log level set to PJ_LOG_ERROR (#2542)
Bug fixes
---------
@@ -65,9 +65,9 @@ tweaks in the underlying API.
o createOperations(): fix Compound to Geog3D/Projected3D CRS with non-metre ellipsoidal height (#2500)
- o Avoid error messages to be emitted log level is set to PJ_LOG_NONE #2527)
+ o Avoid error messages to be emitted log level is set to PJ_LOG_NONE (#2527)
- o Close database connection when autoclose set to True #2532
+ o Close database connection when autoclose set to True (#2532)
THANKS TO
---------
=====================================
cmake/ProjInstallPath.cmake
=====================================
@@ -40,6 +40,8 @@ else()
set(DEFAULT_INCLUDE_SUBDIR include)
set(DEFAULT_DOC_SUBDIR share/doc/proj)
set(DEFAULT_CMAKE_SUBDIR lib/cmake)
+ # Used for proj.pc
+ set(CMAKE_INSTALL_DATAROOTDIR share)
endif()
# Locations are changeable by user to customize layout of PROJ installation
=====================================
cmake/ProjUtilities.cmake
=====================================
@@ -14,7 +14,8 @@
# Macros in this module:
#
# print_variable
-# proj_target_output_name:
+# proj_target_output_name
+# configure_proj_pc
#
################################################################################
@@ -60,3 +61,31 @@ function(proj_target_output_name TARGET_NAME OUTPUT_NAME)
set(${OUTPUT_NAME} ${TARGET_NAME}${SUFFIX} PARENT_SCOPE)
endfunction()
+
+#
+# Configure a pkg-config file proj.pc
+# See also ProjInstallPath.cmake
+#
+
+function(configure_proj_pc)
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "$\{prefix\}")
+ set(libdir "$\{exec_prefix\}/${PROJ_LIB_SUBDIR}")
+ set(includedir "$\{prefix\}/${PROJ_INCLUDE_SUBDIR}")
+ set(datarootdir "$\{prefix\}/${CMAKE_INSTALL_DATAROOTDIR}")
+ set(datadir "$\{datarootdir\}")
+ set(PACKAGE "proj")
+ set(VERSION ${PROJ_VERSION})
+ set(SQLITE3_LIBS -lsqlite3)
+ if(TIFF_ENABLED)
+ set(TIFF_LIBS -ltiff)
+ endif()
+ if(CURL_ENABLED)
+ set(CURL_LIBS -lcurl)
+ endif()
+
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/proj.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/proj.pc
+ @ONLY)
+endfunction()
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+proj (8.0.0~rc2-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Update 8.0.0~rc1 symbols for other architectures.
+ * Drop spelling-errors.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 25 Feb 2021 19:58:46 +0100
+
proj (8.0.0~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
=====================================
debian/libproj22.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 8.0.0~rc1 amd64
+# SymbolsHelper-Confirmed: 8.0.0~rc1 amd64 arm64 armel armhf hppa hurd-i386 i386 ia64 m68k mips64el mipsel powerpc ppc64el sh4 sparc64 x32
libproj.so.22 #PACKAGE# #MINVER#
* Build-Depends-Package: libproj-dev
_Z10pj_ell_setP6pj_ctxP8ARG_listPdS3_ at Base 8.0.0~rc1
@@ -1188,8 +1188,8 @@ libproj.so.22 #PACKAGE# #MINVER#
(optional=templinst|arch=!armel !riscv64)_ZNSt12__shared_ptrIN5osgeo4proj3crs3CRSELN9__gnu_cxx12_Lock_policyE2EEC2INS2_13GeographicCRSEvEERKS_IT_LS5_2EE at Base 6.0.0
(optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE1EEC1INS2_14TransformationEvEERKS_IT_LS5_1EE at Base 7.1.0
(optional=templinst|arch=armel)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE1EEC2INS2_14TransformationEvEERKS_IT_LS5_1EE at Base 7.1.0
- (optional=templinst|arch=arm64 armhf hppa ia64 m68k mips64el ppc64el sh4 sparc64)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE2EEC1INS2_14TransformationEvEERKS_IT_LS5_2EE at Base 7.2.1
- (optional=templinst|arch=arm64 armhf hppa ia64 m68k mips64el ppc64el sh4 sparc64)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE2EEC2INS2_14TransformationEvEERKS_IT_LS5_2EE at Base 7.2.1
+ (optional=templinst|arch=armhf)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE2EEC1INS2_14TransformationEvEERKS_IT_LS5_2EE at Base 7.2.1
+ (optional=templinst|arch=armhf)_ZNSt12__shared_ptrIN5osgeo4proj9operation19CoordinateOperationELN9__gnu_cxx12_Lock_policyE2EEC2INS2_14TransformationEvEERKS_IT_LS5_2EE at Base 7.2.1
(optional=templinst)_ZNSt13_Bvector_baseISaIbEE13_M_deallocateEv at Base 6.0.0
_ZNSt14_Function_baseD1Ev at Base 7.1.1
_ZNSt14_Function_baseD2Ev at Base 7.1.1
@@ -1897,8 +1897,8 @@ libproj.so.22 #PACKAGE# #MINVER#
(optional=templinst)_ZNSt3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4lessIS5_ESaIS5_EED1Ev at Base 6.0.0
(optional=templinst)_ZNSt3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4lessIS5_ESaIS5_EED2Ev at Base 6.0.0
(optional=templinst|arch=amd64 arm64 x32)_ZNSt3setISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESt4lessIS7_ESaIS7_EE6insertEOS7_ at Base 7.2.0
- (optional=templinst|arch=amd64 armel armhf ia64)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_EC1IS5_S5_Lb1EEERKS5_S9_ at Base 7.1.0
- (optional=templinst|arch=amd64 armel armhf ia64)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_EC2IS5_S5_Lb1EEERKS5_S9_ at Base 7.1.0
+ (optional=templinst|arch=amd64 arm64 armel armhf ia64 sparc64)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_EC1IS5_S5_Lb1EEERKS5_S9_ at Base 7.1.0
+ (optional=templinst|arch=amd64 arm64 armel armhf ia64 sparc64)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_EC2IS5_S5_Lb1EEERKS5_S9_ at Base 7.1.0
(optional=templinst)_ZNSt5dequeIdSaIdEE16_M_push_back_auxIJRKdEEEvDpOT_ at Base 6.0.0
(optional=templinst)_ZNSt6vectorIN5osgeo4proj2io16AuthorityFactory10ObjectTypeESaIS4_EE17_M_realloc_insertIJRKS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_ at Base 6.0.0
(optional=templinst)_ZNSt6vectorIN5osgeo4proj2io16AuthorityFactory10ObjectTypeESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_ at Base 6.0.0
@@ -1937,7 +1937,7 @@ libproj.so.22 #PACKAGE# #MINVER#
(optional=templinst|arch=amd64 arm64 ia64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIhSaIhEE17_M_default_appendEm at Base 7.0.0
(optional=templinst)_ZNSt6vectorIhSaIhEEaSERKS1_ at Base 7.1.1
(optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_ at Base 7.2.0
- (optional=templinst)_ZNSt6vectorImSaImEE17_M_realloc_insertIJRKmEEEvN9__gnu_cxx17__normal_iteratorIPmS1_EEDpOT_ at Base 7.2.1
+ (optional=templinst|arch=amd64 arm64 ia64 mips64el ppc64el sparc64)_ZNSt6vectorImSaImEE17_M_realloc_insertIJRKmEEEvN9__gnu_cxx17__normal_iteratorIPmS1_EEDpOT_ at Base 7.2.1
(optional=templinst)_ZNSt6vectorIxSaIxEE17_M_realloc_insertIJxEEEvN9__gnu_cxx17__normal_iteratorIPxS1_EEDpOT_ at Base 7.0.0
(optional=templinst)_ZNSt7__cxx1110_List_baseIN5osgeo4proj2io16AuthorityFactory7CRSInfoESaIS5_EE8_M_clearEv at Base 6.0.0
(optional=templinst)_ZNSt7__cxx1110_List_baseIN5osgeo4proj2io16AuthorityFactory8UnitInfoESaIS5_EE8_M_clearEv at Base 7.1.0
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-spelling-errors.patch
=====================================
debian/patches/spelling-errors.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Description: Fix spelling errors.
- * Allow to <verb> -> Allows <verb>ing
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/OSGeo/PROJ/pull/2544
-Applied-Upstream: https://github.com/OSGeo/PROJ/commit/cbd4506ddd4ee97586a27302c417b84c41c56b0a
-
---- a/man/man1/projinfo.1
-+++ b/man/man1/projinfo.1
-@@ -331,7 +331,7 @@ only used for coordinate operation compu
- New in version 8.0.
-
- .sp
--Allow to export a geographic or projected 3D CRS as a compound CRS whose
-+Allows exporting a geographic or projected 3D CRS as a compound CRS whose
- vertical CRS represents the ellipsoidal height.
- .sp
- \fBNOTE:\fP
=====================================
include/proj/internal/io_internal.hpp
=====================================
@@ -201,7 +201,10 @@ struct projCppContext {
return auxDbPaths_;
}
- void setAutoCloseDb(bool autoClose) { autoCloseDb_ = autoClose; autoCloseDbIfNeeded(); }
+ void setAutoCloseDb(bool autoClose) {
+ autoCloseDb_ = autoClose;
+ autoCloseDbIfNeeded();
+ }
inline bool getAutoCloseDb() const { return autoCloseDb_; }
// cppcheck-suppress functionStatic
=====================================
src/iso19111/metadata.cpp
=====================================
@@ -1124,7 +1124,7 @@ void Identifier::_exportToJSON(JSONFormatter *formatter) const {
//! @cond Doxygen_Suppress
static bool isIgnoredChar(char ch) {
return ch == ' ' || ch == '_' || ch == '-' || ch == '/' || ch == '(' ||
- ch == ')' || ch == '.' || ch == '&';
+ ch == ')' || ch == '.' || ch == '&' || ch == ',';
}
//! @endcond
=====================================
test/unit/test_metadata.cpp
=====================================
@@ -391,4 +391,8 @@ TEST(metadata, Identifier_isEquivalentName) {
EXPECT_TRUE(Identifier::isEquivalentName("a", "\xc3\xa1"));
EXPECT_TRUE(Identifier::isEquivalentName("\xc3\xa4", "\xc3\xa1"));
+
+ EXPECT_TRUE(Identifier::isEquivalentName(
+ "Unknown based on International 1924 (Hayford 1909, 1910) ellipsoid",
+ "Unknown_based_on_International_1924_Hayford_1909_1910_ellipsoid"));
}
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/compare/fe592b23473df1243651f081e6a22f90017bd8d2...2cd14ab7f639ae7c53d89b24f9bbdea863adeb7e
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/compare/fe592b23473df1243651f081e6a22f90017bd8d2...2cd14ab7f639ae7c53d89b24f9bbdea863adeb7e
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/20210225/1ef05001/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list