[Git][debian-gis-team/libcitygml][master] 5 commits: New upstream version 2.0.9
Bas Couwenberg
gitlab at salsa.debian.org
Thu Apr 19 16:04:08 BST 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / libcitygml
Commits:
5c06b056 by Bas Couwenberg at 2018-04-19T16:43:03+02:00
New upstream version 2.0.9
- - - - -
db0df9b7 by Bas Couwenberg at 2018-04-19T16:43:05+02:00
Merge tag 'upstream/2.0.9'
Upstream version 2.0.9
- - - - -
a0ab0fec by Bas Couwenberg at 2018-04-19T16:43:21+02:00
New upstream release.
- - - - -
182acdeb by Bas Couwenberg at 2018-04-19T16:55:05+02:00
Update symbols for amd64.
- - - - -
a209b939 by Bas Couwenberg at 2018-04-19T16:55:05+02:00
Set distribution to unstable.
- - - - -
8 changed files:
- CMakeLists.txt
- CMakeModules/FindXerces.cmake
- debian/changelog
- debian/libcitygml2.symbols
- osgplugin/CMakeLists.txt
- sources/CMakeLists.txt
- sources/src/parser/geometryelementparser.cpp
- test/CMakeLists.txt
Changes:
=====================================
CMakeLists.txt
=====================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,11 +4,11 @@ PROJECT ( libcitygml )
set(META_VERSION_MAJOR "2")
set(META_VERSION_MINOR "0")
-set(META_VERSION_PATCH "8")
+set(META_VERSION_PATCH "9")
set(META_VERSION "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
-SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" )
+SET( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
IF(WIN32)
@@ -197,7 +197,7 @@ IF(UNIX AND NOT APPLE)
set(CPACK_PACKAGE_VERSION_MAJOR "${META_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${META_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${META_VERSION_PATCH}")
- set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGE_RELOCATABLE OFF)
# Debian package information
=====================================
CMakeModules/FindXerces.cmake
=====================================
--- a/CMakeModules/FindXerces.cmake
+++ b/CMakeModules/FindXerces.cmake
@@ -29,14 +29,14 @@ ${XERCESC_INCLUDE_DIR}
)
IF (XERCESC_STATIC)
-FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.2 xerces-c-3.1 xerces-c
+FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.2 xerces-c-3.1 xerces-c xerces-c_3
PATHS
$ENV{XERCESC_LIBRARY_DIR}
${XERCESC_LIBRARY_DIR}
/usr/lib
/usr/local/lib
)
-FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.2D xerces-c-3.1D
+FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.2D xerces-c-3.1D xerces-c_3D
PATHS
$ENV{XERCESC_LIBRARY_DIR}
${XERCESC_LIBRARY_DIR}
@@ -65,13 +65,13 @@ ENDIF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
IF(XERCESC_FOUND)
- IF(${XERCESC_LIBRARY_DEBUG})
+ IF(XERCESC_LIBRARY_DEBUG)
SET(XERCESC_LIBRARIES
optimized ${XERCESC_LIBRARY}
debug ${XERCESC_LIBRARY_DEBUG})
- ELSE(${XERCESC_LIBRARY_DEBUG})
+ ELSE(XERCESC_LIBRARY_DEBUG)
SET(XERCESC_LIBRARIES ${XERCESC_LIBRARY})
- ENDIF(${XERCESC_LIBRARY_DEBUG})
+ ENDIF(XERCESC_LIBRARY_DEBUG)
FIND_PATH(XERCESC_XVERHPPPATH NAMES XercesVersion.hpp PATHS
${XERCESC_INCLUDE}
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-libcitygml (2.0.8-2) UNRELEASED; urgency=medium
+libcitygml (2.0.9-1) unstable; urgency=medium
+ * Team upload.
+ * New upstream release.
* Update copyright-format URL to use HTTPS.
* Update Vcs-* URLs for Salsa.
* Bump Standards-Version to 4.1.4, no changes.
+ * Update symbols for amd64.
- -- Bas Couwenberg <sebastic at debian.org> Sat, 20 Jan 2018 22:03:59 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 19 Apr 2018 16:44:03 +0200
libcitygml (2.0.8-1) unstable; urgency=medium
=====================================
debian/libcitygml2.symbols
=====================================
--- a/debian/libcitygml2.symbols
+++ b/debian/libcitygml2.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 2.0.8 alpha amd64 armel armhf hppa hurd-i386 i386 m68k mips mipsel powerpc powerpcspe ppc64 s390x sh4 sparc64 x32
+# SymbolsHelper-Confirmed: 2.0.9 amd64
libcitygml.so.2 libcitygml2 #MINVER#
_Z11toStdStringB5cxx11PKDs at Base 2.0.4
_Z14toXercesStringRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE at Base 1.4.3
@@ -1453,7 +1453,7 @@ libcitygml.so.2 libcitygml2 #MINVER#
(optional=templinst)_ZNSt6vectorISt10unique_ptrIN7citygml10CityObjectESt14default_deleteIS2_EESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_ at Base 2.0.4
(optional=templinst)_ZNSt6vectorISt10unique_ptrIN7citygml16ImplicitGeometryESt14default_deleteIS2_EESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_ at Base 2.0.4
(optional=templinst)_ZNSt6vectorISt10unique_ptrIN7citygml8GeometryESt14default_deleteIS2_EESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_ at Base 2.0.4
- (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertIJRKfEEEvN9__gnu_cxx17__normal_iteratorIPfS1_EEDpOT_ at Base 2.0.4
+ (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertIJfEEEvN9__gnu_cxx17__normal_iteratorIPfS1_EEDpOT_ at Base 2.0.9
(optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_ at Base 2.0.4
(optional=templinst)_ZNSt6vectorIjSaIjEEaSERKS1_ at Base 1.4.3
(optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev at Base 1.4.3
=====================================
osgplugin/CMakeLists.txt
=====================================
--- a/osgplugin/CMakeLists.txt
+++ b/osgplugin/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package( OpenSceneGraph REQUIRED osgDB osgViewer osgGA osgUtil osgText)
include_directories(
${OPENSCENEGRAPH_INCLUDE_DIRS}
- ${CMAKE_SOURCE_DIR}/sources/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../sources/include
)
set( sources ReaderWriterCityGML.cpp )
=====================================
sources/CMakeLists.txt
=====================================
--- a/sources/CMakeLists.txt
+++ b/sources/CMakeLists.txt
@@ -1,7 +1,7 @@
include(GenerateExportHeader)
IF (NOT DEFINED CMAKE_MODULE_PATH)
- GET_FILENAME_COMPONENT(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../CMakeModules" ABSOLUTE)
+ GET_FILENAME_COMPONENT(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../CMakeModules" ABSOLUTE)
ENDIF (NOT DEFINED CMAKE_MODULE_PATH)
SET( target citygml )
=====================================
sources/src/parser/geometryelementparser.cpp
=====================================
--- a/sources/src/parser/geometryelementparser.cpp
+++ b/sources/src/parser/geometryelementparser.cpp
@@ -59,7 +59,7 @@ namespace citygml {
geometryTypeIDSet.insert(NodeType::GML_ShellNode.typeID());
geometryTypeIDSet.insert(NodeType::GML_PolyhedralSurfaceNode.typeID());
geometryTypeIDSet.insert(NodeType::GML_SurfaceNode.typeID());
- geometryTypeIDSet.insert(NodeType::GML_ShellNode.typeID());
+ geometryTypeIDSet.insert(NodeType::GML_MultiCurveNode.typeID());
geometryTypeIDSetInitialized = true;
}
=====================================
test/CMakeLists.txt
=====================================
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,7 +12,7 @@ ELSE( LIBCITYGML_DYNAMIC )
ENDIF( LIBCITYGML_DYNAMIC )
# INCLUDE_DIRECTORIES( ${CITYGML_INCLUDE_DIR} )
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/sources/include ${CMAKE_BINARY_DIR}/sources/include)
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../sources/include ${CMAKE_BINARY_DIR}/sources/include)
SET( PRG_SRCS citygmltest.cpp )
View it on GitLab: https://salsa.debian.org/debian-gis-team/libcitygml/compare/4919db58751595240727e992437bdb200903934e...a209b939a61d98039dc17b14b3cefc96537e95c5
---
View it on GitLab: https://salsa.debian.org/debian-gis-team/libcitygml/compare/4919db58751595240727e992437bdb200903934e...a209b939a61d98039dc17b14b3cefc96537e95c5
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/20180419/9b734e63/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list