[med-svn] [Git][med-team/opensurgsim][master] 4 commits: Fix for build failure with boost 1.65

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / opensurgsim


Commits:
94bfa6c4 by Andreas Tille at 2018-03-20T11:27:24+01:00
Fix for build failure with boost 1.65

- - - - -
8b227866 by Andreas Tille at 2018-03-20T11:27:42+01:00
Standards-Version: 4.1.3

- - - - -
b68fb519 by Andreas Tille at 2018-03-20T12:47:09+01:00
debhelper 11

- - - - -
6db5d304 by Andreas Tille at 2018-03-20T14:11:48+01:00
Install NOTICE file, upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/docs
- + debian/patches/boost-1.65-compat.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+opensurgsim (0.7.0-7) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Steve Langasek ]
+  * Fix for build failure with boost 1.65
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.1.3
+  * debhelper 11
+  * Install NOTICE file
+
+ -- Andreas Tille <tille at debian.org>  Tue, 20 Mar 2018 11:28:00 +0100
+
 opensurgsim (0.7.0-6) unstable; urgency=medium
 
   * Team upload


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Paul Novotny <paul at paulnovo.us>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                dh-linktree,
                libboost-chrono-dev,
                libboost-date-time-dev,
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 10),
                libjs-mathjax,
                libopenscenegraph-dev,
                libyaml-cpp-dev (>= 0.5.2)
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/opensurgsim.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/opensurgsim.git
 Homepage: http://www.opensurgsim.org/


=====================================
debian/docs
=====================================
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+NOTICE


=====================================
debian/patches/boost-1.65-compat.patch
=====================================
--- /dev/null
+++ b/debian/patches/boost-1.65-compat.patch
@@ -0,0 +1,28 @@
+Description: make code compatible with boost 1.65.
+ The code previously worked by virtue of certain standard headers (iostream)
+ being indirectly included via boost.  In boost 1.65 these headers are not
+ included for us, so include them directly.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Last-Updated: 2018-03-19
+Bug-Debian: https://bugs.debian.org/893589
+
+Index: opensurgsim-0.7.0/SurgSim/Blocks/DebugDumpBehavior.cpp
+===================================================================
+--- opensurgsim-0.7.0.orig/SurgSim/Blocks/DebugDumpBehavior.cpp
++++ opensurgsim-0.7.0/SurgSim/Blocks/DebugDumpBehavior.cpp
+@@ -13,6 +13,8 @@
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+ 
++#include <iostream>
++
+ #include "SurgSim/Blocks/DebugDumpBehavior.h"
+ 
+ #include "SurgSim/DataStructures/DataGroup.h"
+@@ -163,4 +165,4 @@
+ }
+ 
+ }
+-}
+\ No newline at end of file
++}


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix-matrix-tests.patch
 disable-thread-pool-on-armel.patch
 Assert-death-only-if-supported.patch
 ignore-failing-tests.patch
+boost-1.65-compat.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=-format,+bindnow
 export GOOGLEMOCK_DIR = /usr/src/googletest/googlemock
 
 %:
-	dh $@ --parallel --with linktree
+	dh $@ --with linktree
 
 ifeq (,$(filter $(DEB_BUILD_ARCH),i386 arm64 armel armhf powerpc ppc64el ppc64))
     EIGEN_ALIGNMENT=ON



View it on GitLab: https://salsa.debian.org/med-team/opensurgsim/compare/f343763ad29751a0f47f0927807b34b4263dde38...6db5d3042aa37f9e47691331ddf760d6912cec4e

---
View it on GitLab: https://salsa.debian.org/med-team/opensurgsim/compare/f343763ad29751a0f47f0927807b34b4263dde38...6db5d3042aa37f9e47691331ddf760d6912cec4e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180320/cd21c133/attachment-0001.html>