This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository sfcgal.
commit 240a1d9bbf2acb96de4d983088645ffa5271b18f
Merge: 2b5689a 66cd21c
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Jan 15 17:12:52 2016 +0100
Merge tag 'debian/1.2.2-1' into jessie-backports
Conflicts:
debian/changelog
.gitignore | 21 +-
.travis.yml | 23 +
CMakeLists.txt | 11 +-
NEWS | 20 +-
cmake/Modules/FindCGAL.cmake | 3 +-
debian/changelog | 62 +-
debian/control | 20 +-
debian/copyright | 13 +-
debian/libsfcgal1.lintian-overrides | 3 +-
debian/libsfcgal1.symbols | 9807 ++++++++------------
...g-errors-accourding-to-lintian-tool-of-th.patch | 82 -
...T_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch | 29 -
debian/patches/0003-style-test-is-not-robust.patch | 29 -
debian/patches/series | 3 -
debian/rules | 22 +-
src/Exception.h | 2 +-
src/algorithm/Intersection3D.cpp | 12 +-
src/algorithm/connection.cpp | 2 +-
src/algorithm/covers.h | 2 +-
src/algorithm/difference.cpp | 1 -
src/algorithm/difference.h | 2 +-
src/algorithm/differencePrimitives.h | 8 +-
src/algorithm/intersection.h | 2 +-
src/algorithm/intersects.cpp | 4 +-
src/algorithm/intersects.h | 2 +-
src/algorithm/isValid.cpp | 12 +
src/algorithm/minkowskiSum.cpp | 8 +
src/algorithm/straightSkeleton.cpp | 137 +-
src/algorithm/straightSkeleton.h | 16 +-
src/algorithm/translate.cpp | 12 +
src/algorithm/translate.h | 7 +-
src/algorithm/union.cpp | 8 +-
src/algorithm/union.h | 2 +-
src/capi/sfcgal_c.cpp | 1 +
src/capi/sfcgal_c.h | 10 +-
src/detail/GeometrySet.cpp | 4 +-
src/detail/Point_inside_polyhedron.h | 19 +
src/detail/TestGeometry.h | 2 +
src/detail/graph/Edge.h | 2 +-
src/detail/graph/GeometryGraph.h | 2 +-
test/CMakeLists.txt | 10 +-
test/bench/BenchStraightSkeleton.cpp | 95 +
.../StraightSkeletonTest.txt | 0
test/data/StraightSkeletonTest/issue111.txt | 3 +
test/garden/CMakeLists.txt | 4 +-
test/regress/standalone/CMakeLists.txt | 4 +-
test/regress/standalone/README | 15 +
.../standalone/SFCGAL/StraightSkeletonTest.cpp | 97 +-
test/unit/CMakeLists.txt | 4 +-
...tSkeletonTest.cpp => ApproximateMedialAxis.cpp} | 60 +-
.../unit/SFCGAL/algorithm/StraightSkeletonTest.cpp | 54 +-
test/unit/SFCGAL/capi/sfcgal_cTest.cpp | 28 +
travis/linux/before_install.sh | 24 +
travis/linux/install_cgal.sh | 14 +
viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp | 2 +-
55 files changed, 4501 insertions(+), 6340 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/sfcgal.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
