This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository ossim.
commit 557954b3175c6ca5be6a21d95f1769d42e5878f4 Author: Bas Couwenberg <[email protected]> Date: Wed Jun 29 18:24:58 2016 +0200 Add upstream patch to fix FTBFS with GCC 6. --- debian/changelog | 8 ++++++++ debian/patches/fix-ossim-trac-2354.diff | 34 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 43 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1dae8c9..c2e0e91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ossim (1.8.20.3+ds-4) UNRELEASED; urgency=medium + + * Team upload. + * Add upstream patch to fix FTBFS with GCC 6. + (closes: #811851) + + -- Bas Couwenberg <[email protected]> Wed, 29 Jun 2016 17:58:32 +0200 + ossim (1.8.20.3+ds-3) unstable; urgency=medium * Team upload. diff --git a/debian/patches/fix-ossim-trac-2354.diff b/debian/patches/fix-ossim-trac-2354.diff new file mode 100644 index 0000000..88d890d --- /dev/null +++ b/debian/patches/fix-ossim-trac-2354.diff @@ -0,0 +1,34 @@ +Description: Fix build failure with GCC 6: no match for 'operator<<'. +Author: Rashad M <[email protected]> +Origin: https://trac.osgeo.org/ossim/attachment/ticket/2354/fix-ossim-trac-2354.diff +Bug-Debian: https://bugs.debian.org/811851 +Bug: https://trac.osgeo.org/ossim/ticket/2354 + +--- a/ossim/src/ossim/elevation/ossimElevManager.cpp ++++ b/ossim/src/ossim/elevation/ossimElevManager.cpp +@@ -635,6 +635,11 @@ double ossimElevManager::getMeanSpacingM + return spacing; + } + ++inline std::ostream& operator<<(std::ostream& out, std::ostream& obj) ++{ ++ return obj; ++} ++ + std::ostream& ossimElevManager::print(ostream& out) const + { + out << "\nossimElevManager @ "<< (ossim_uint64) this +--- a/ossim/src/ossim/elevation/ossimElevSource.cpp ++++ b/ossim/src/ossim/elevation/ossimElevSource.cpp +@@ -262,6 +262,11 @@ void ossimElevSource::setComputeStatisti + theComputeStatsFlag = flag; + } + ++inline std::ostream& operator<<(std::ostream& out, std::ostream& obj) ++{ ++ return obj; ++} ++ + std::ostream& ossimElevSource::print(std::ostream& out) const + { + out << "\nossimElevSource @ "<< (ossim_uint64) this diff --git a/debian/patches/series b/debian/patches/series index 15781fb..95fa81f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ output-typo.patch accommodate-typo.patch extension-typo.patch spelling-errors.patch +fix-ossim-trac-2354.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
