[sfcgal] 01/02: Merge tag 'debian/1.3.0-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Mar 13 17:48:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository sfcgal.
commit c4531b09255f04c527e6397af5677694f0453515
Merge: 881d66b f717fe0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Mar 13 18:15:44 2016 +0100
Merge tag 'debian/1.3.0-1' into jessie-backports
Conflicts:
debian/changelog
debian/control
CMakeLists.txt | 29 +-
NEWS | 10 +
debian/changelog | 21 +
debian/control | 23 +-
debian/copyright | 30 +
debian/libsfcgal1.symbols | 457 +++-----
debian/rules | 3 +-
debian/sfcgal-bin.docs | 1 -
debian/sfcgal-bin.install | 1 -
debian/sfcgal-bin.manpages | 1 -
debian/viewer-SFCGAL.1 | 18 -
debian/watch | 6 +-
.../boost-1.60.0/boost/graph/adjacency_matrix.hpp | 1238 ++++++++++++++++++++
src/Geometry.cpp | 14 +-
src/Geometry.h | 17 +-
src/Grid.cpp | 138 ---
src/Grid.h | 239 ----
src/algorithm/extrude.cpp | 4 +-
src/algorithm/isValid.cpp | 74 +-
src/algorithm/isValid.h | 71 +-
src/algorithm/minkowskiSum.cpp | 4 +-
src/algorithm/straightSkeleton.cpp | 165 ++-
src/algorithm/straightSkeleton.h | 11 +-
src/algorithm/union.cpp | 2 -
src/capi/sfcgal_c.cpp | 62 +-
src/capi/sfcgal_c.h | 30 +
src/detail/ForceValidityVisitor.cpp | 171 +++
src/{io/asc.h => detail/ForceValidityVisitor.h} | 42 +-
src/detail/io/WktReader.cpp | 12 +-
src/detail/tools/Log.h | 4 -
src/detail/transform/AffineTransform2.cpp | 6 +-
src/detail/transform/AffineTransform3.cpp | 5 +-
src/detail/transform/Force2D.cpp | 5 +-
src/detail/transform/ForceZ.cpp | 5 +-
src/io/asc.cpp | 125 --
src/io/wkt.cpp | 18 +-
src/triangulate/triangulate2DZ.cpp | 2 +-
test/bench/BenchPredicate.cpp | 73 ++
test/data/CoversTest.txt | 4 +-
test/garden/main.cpp | 5 +-
test/regress/standalone/SFCGAL/ASCTest.cpp | 102 --
test/unit/SFCGAL/GridTest.cpp | 180 ---
.../SFCGAL/algorithm/ApproximateMedialAxis.cpp | 18 +-
test/unit/SFCGAL/algorithm/DistanceTest.cpp | 2 +-
.../unit/SFCGAL/algorithm/StraightSkeletonTest.cpp | 16 +
test/unit/SFCGAL/capi/sfcgal_cTest.cpp | 20 +
test/unit/SFCGAL/io/WktReaderTest.cpp | 38 +-
.../unit/SFCGAL/triangulate/Triangulate2DZTest.cpp | 4 -
viewer/CMakeLists.txt | 40 -
viewer/cmake/Modules/FindosgQt.cmake | 50 -
viewer/include/SFCGAL/viewer/GISManipulator.h | 44 -
viewer/include/SFCGAL/viewer/ViewerPlugin.h | 74 --
viewer/include/SFCGAL/viewer/ViewerWidget.h | 102 --
viewer/include/SFCGAL/viewer/ViewerWindow.h | 112 --
viewer/include/SFCGAL/viewer/plugins/DataPlugin.h | 70 --
viewer/include/SFCGAL/viewer/plugins/DemoPlugin.h | 76 --
viewer/include/SFCGAL/viewer/plugins/GridPlugin.h | 67 --
viewer/include/SFCGAL/viewer/plugins/PSQLPlugin.h | 160 ---
viewer/include/db.h | 274 -----
viewer/main.cpp | 105 --
viewer/src/SFCGAL/viewer/GISManipulator.cpp | 82 --
viewer/src/SFCGAL/viewer/ViewerPlugin.cpp | 67 --
viewer/src/SFCGAL/viewer/ViewerWidget.cpp | 353 ------
viewer/src/SFCGAL/viewer/ViewerWindow.cpp | 259 ----
viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp | 103 --
viewer/src/SFCGAL/viewer/plugins/DemoPlugin.cpp | 231 ----
viewer/src/SFCGAL/viewer/plugins/GridPlugin.cpp | 122 --
viewer/src/SFCGAL/viewer/plugins/PSQLPlugin.cpp | 553 ---------
viewer/src/db.cpp | 66 --
69 files changed, 2264 insertions(+), 4272 deletions(-)
diff --cc debian/changelog
index 643b6ec,c181834..8eafacd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,24 +1,32 @@@
+ sfcgal (1.3.0-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Drop viewer-SFCGAL manpage, viewer removed upstream.
+ * Update watch file to support other tar extensions in filenamemangle.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 06 Mar 2016 17:35:54 +0100
+
+ sfcgal (1.3.0-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update Vcs-Git URL to use HTTPS.
+ * Drop sfcgal-bin package, viewer removed upstream.
+ * Update copyright file, add license & copyright for Boost patch.
+ * Bump Standards-Version to 3.9.7, no changes.
+ * Add myself to Uploaders.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 04 Mar 2016 02:16:43 +0100
+
+sfcgal (1.2.2-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Team upload.
+ * Rebuild for jessie-backports.
+ * Update branch in gbp.conf & Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 15 Jan 2016 16:16:46 +0100
+
sfcgal (1.2.2-1) unstable; urgency=medium
* Team upload.
diff --cc debian/control
index 67f75b2,36f0198..680bff7
--- a/debian/control
+++ b/debian/control
@@@ -11,14 -12,11 +12,11 @@@ Build-Depends: debhelper (>= 9)
libgmp-dev,
libopenscenegraph-dev,
libopenthreads-dev,
- libpq-dev,
- libqt4-dev,
- libqt4-opengl-dev,
pkg-kde-tools,
chrpath
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/sfcgal.git/
- Vcs-Git: git://anonscm.debian.org/pkg-grass/sfcgal.git -b jessie-backports
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/sfcgal.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/sfcgal.git -b jessie-backports
Homepage: http://www.sfcgal.org/
Package: libsfcgal1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git
More information about the Pkg-grass-devel
mailing list