[sfcgal] 04/04: New upstream release.
Sven Geggus
giggls-guest at moszumanska.debian.org
Fri Sep 18 21:56:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
giggls-guest pushed a commit to branch master
in repository sfcgal.
commit a47daa40a7c52f0d43b417386f405e1ba122e804
Author: Sven Geggus <sven-deb at geggus.net>
Date: Fri Sep 18 17:49:00 2015 +0200
New upstream release.
Test and thus probably lib does currently not work on sid.
However this does compile just fine in jessie.
Might be libcgal related
---
debian/changelog | 6 ++
...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 -
5 files changed, 6 insertions(+), 143 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a27c5b8..8ce42c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sfcgal (1.2.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Sven Geggus <sven-debian at geggus.net> Fri, 18 Sep 2015 17:47:24 +0200
+
sfcgal (1.1.0-6) unstable; urgency=medium
* Update symbols for mips(el) and armhf
diff --git a/debian/patches/0001-Fix-spelling-errors-accourding-to-lintian-tool-of-th.patch b/debian/patches/0001-Fix-spelling-errors-accourding-to-lintian-tool-of-th.patch
deleted file mode 100644
index b559be5..0000000
--- a/debian/patches/0001-Fix-spelling-errors-accourding-to-lintian-tool-of-th.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7f44429b1c726b47868ff981ae647be061bb319c Mon Sep 17 00:00:00 2001
-From: Sven Geggus <sven-git at geggus.net>
-Date: Sat, 13 Jun 2015 16:35:58 +0200
-Subject: [PATCH] Fix spelling errors accourding to lintian tool of the debian
- distribution
-
----
- src/Exception.h | 2 +-
- src/algorithm/connection.cpp | 2 +-
- src/detail/graph/Edge.h | 2 +-
- src/detail/graph/GeometryGraph.h | 2 +-
- viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/Exception.h b/src/Exception.h
-index cf3178a..b575c4d 100644
---- a/src/Exception.h
-+++ b/src/Exception.h
-@@ -48,7 +48,7 @@ public:
- */
- virtual const char* what() const throw();
- /**
-- * returns diagnostic informations (file, line, etc.)
-+ * returns diagnostic information (file, line, etc.)
- */
- std::string diagnostic() const throw();
- protected:
-diff --git a/src/algorithm/connection.cpp b/src/algorithm/connection.cpp
-index 559e5de..0d3906f 100644
---- a/src/algorithm/connection.cpp
-+++ b/src/algorithm/connection.cpp
-@@ -51,7 +51,7 @@ void SurfaceGraph::addRing( const LineString& ring, FaceIndex faceIndex )
-
- if ( foundEdgeWithBadOrientation != _edgeMap.end() ) {
- _isValid = Validity::invalid(
-- ( boost::format( "inconsistant orientation of PolyhedralSurface detected at edge %d (%d-%d) of polygon %d" ) % s % edge.first % edge.second % faceIndex ).str()
-+ ( boost::format( "inconsistent orientation of PolyhedralSurface detected at edge %d (%d-%d) of polygon %d" ) % s % edge.first % edge.second % faceIndex ).str()
- );
- }
-
-diff --git a/src/detail/graph/Edge.h b/src/detail/graph/Edge.h
-index e751ba5..b69b84d 100644
---- a/src/detail/graph/Edge.h
-+++ b/src/detail/graph/Edge.h
-@@ -28,7 +28,7 @@ namespace graph {
-
- /**
- * @brief [private]An edge in a GeometryGraph with minimal requirements (some algorithms could need
-- * more informations)
-+ * more information)
- */
- struct SFCGAL_API Edge {
- Edge( const int& face_ = -1 );
-diff --git a/src/detail/graph/GeometryGraph.h b/src/detail/graph/GeometryGraph.h
-index 7b54883..2584271 100644
---- a/src/detail/graph/GeometryGraph.h
-+++ b/src/detail/graph/GeometryGraph.h
-@@ -52,7 +52,7 @@ inline EdgeDirection reverse( const EdgeDirection& direction )
- *
- * @brief [private]Represents the vertices and edges for a list of geometries.
- *
-- * A boost::adjancency_list is wrapped in order to be able to annex some informations
-+ * A boost::adjancency_list is wrapped in order to be able to annex some information
- * and to provide basic functionalities.
- *
- * @warning duplicate matching is performed in GeometryGraphBuilder (allows to modify position once it's done)
-diff --git a/viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp b/viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp
-index b9122ef..71b125c 100644
---- a/viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp
-+++ b/viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp
-@@ -91,7 +91,7 @@ void DataPlugin::load()
- {
- QMenu* pluginMenu = viewerWindow()->menuBar()->addMenu( "Data" ) ;
-
-- QAction* actionDisplayInformations = pluginMenu->addAction( QString( "&display informations" ) );
-+ QAction* actionDisplayInformations = pluginMenu->addAction( QString( "&display information" ) );
- connect( actionDisplayInformations, SIGNAL( triggered() ), this, SLOT( displayInformations() ) );
- }
-
---
-2.1.4
-
diff --git a/debian/patches/0002-define-BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch b/debian/patches/0002-define-BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch
deleted file mode 100644
index 535795a..0000000
--- a/debian/patches/0002-define-BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ba2e5c17db0e2276369bac57133f3f7775b68286 Mon Sep 17 00:00:00 2001
-From: Ko Nagase <nagase at georepublic.co.jp>
-Date: Wed, 19 Aug 2015 00:50:34 +0900
-Subject: [PATCH] define BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT in case of
- boost 1.58.0 build (#103)
-
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ddadd0c..42bf129 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -72,7 +72,10 @@ if ( SFCGAL_BUILD_TESTS OR SFCGAL_BUILD_EXAMPLES OR SFCGAL_BUILD_OSG OR SFCGAL_B
- set( SFCGAL_Boost_COMPONENTS program_options chrono filesystem timer ${SFCGAL_Boost_COMPONENTS} )
- endif()
- find_package( Boost COMPONENTS ${SFCGAL_Boost_COMPONENTS} REQUIRED )
--
-+if((${Boost_MAJOR_VERSION} EQUAL 1) AND (${Boost_MINOR_VERSION} EQUAL 58))
-+ message( STATUS "Defining BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT" )
-+ add_definitions( "-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT" )
-+endif()
-
- #-- GMP (facultative) -------------------------------------
- find_package( GMP )
---
-2.1.4
-
diff --git a/debian/patches/0003-style-test-is-not-robust.patch b/debian/patches/0003-style-test-is-not-robust.patch
deleted file mode 100644
index e5c98e6..0000000
--- a/debian/patches/0003-style-test-is-not-robust.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 24db3b8a2aec64db6da32b1cc6bf4d4a3840b9f8 Mon Sep 17 00:00:00 2001
-From: vmora <vincent.mora at oslandia.com>
-Date: Thu, 27 Aug 2015 13:21:34 +0200
-Subject: [PATCH] style test is not robust I prefer to remove a test that fails
- and keep the requirement for 100% test pass
-
----
- test/CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 67469fc..64f8014 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -18,11 +18,3 @@ if( SFCGAL_BUILD_BENCH )
- add_subdirectory( bench )
- endif()
-
--if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-- add_test( style-test ${CMAKE_SOURCE_DIR}/script/test-style-SFCGAL.sh )
--endif()
--
--
--
--
--
---
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e2589fc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-Fix-spelling-errors-accourding-to-lintian-tool-of-th.patch
-0002-define-BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch
-0003-style-test-is-not-robust.patch
--
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