[med-svn] [Git][med-team/prime-phylo][master] 5 commits: Fix build with Boost 1.67
Andreas Tille
gitlab at salsa.debian.org
Sun Nov 4 07:34:37 GMT 2018
Andreas Tille pushed to branch master at Debian Med / prime-phylo
Commits:
03399710 by Andreas Tille at 2018-11-04T07:29:06Z
Fix build with Boost 1.67
- - - - -
dc6ed9f5 by Andreas Tille at 2018-11-04T07:29:39Z
Standards-Version: 4.2.1
- - - - -
49654221 by Andreas Tille at 2018-11-04T07:29:39Z
Secure URI in copyright format
- - - - -
242b0ce8 by Andreas Tille at 2018-11-04T07:29:40Z
Remove trailing whitespace in debian/copyright
- - - - -
aaf52fc6 by Andreas Tille at 2018-11-04T07:34:00Z
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/0003-Fix-build-with-Boost-1.67.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+prime-phylo (1.0.11-7) unstable; urgency=medium
+
+ [ Giovanni Mascellani ]
+ * Fix build with Boost 1.67
+ Closes: #912781
+
+ [ Andreas Tille ]
+ * Standards-Version: 4.2.1
+ * Secure URI in copyright format
+ * Remove trailing whitespace in debian/copyright
+
+ -- Andreas Tille <tille at debian.org> Sun, 04 Nov 2018 08:29:40 +0100
+
prime-phylo (1.0.11-6) unstable; urgency=medium
[ Juhani Numminen ]
=====================================
debian/control
=====================================
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 11~),
libboost-mpi-dev,
libboost-serialization-dev,
zlib1g-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
Vcs-Browser: https://salsa.debian.org/med-team/prime-phylo
Vcs-Git: https://salsa.debian.org/med-team/prime-phylo.git
Homepage: http://prime.sbc.su.se
=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: PrIME
Upstream-Contact: Erik Sjolund <erik.sjolund at gmail.com>
Source: http://prime.sbc.su.se/download/
@@ -39,7 +39,7 @@ License: Expat
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Files: src/cxx/libraries/prime/PRNG.hh
-Copyright: 1997 - 2002 Takuji Nishimura, Makoto Matsumoto
+Copyright: 1997 - 2002 Takuji Nishimura, Makoto Matsumoto
2003 - 2012 Lars Arvestad<arve at csc.kth.se>,
Bengt Sennblad<bengt.sennblad at ki.se>,
Mattias Franberg
@@ -72,8 +72,8 @@ License: BSD-3-clause
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
.
- 3. The names of its contributors may not be used to endorse or promote
- products derived from this software without specific prior written
+ 3. The names of its contributors may not be used to endorse or promote
+ products derived from this software without specific prior written
permission.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -91,41 +91,41 @@ License: BSD-3-clause
License: MTL
Indiana University has the exclusive rights to license this product under the following license.
.
- Redistribution and use in source and binary forms, with or without modification, are permitted
+ Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
- 1. All redistributions of source code must retain the above copyright notice,
- the list of authors in the original source code, this list of conditions and
+ 1. All redistributions of source code must retain the above copyright notice,
+ the list of authors in the original source code, this list of conditions and
the disclaimer listed in this license;
- 2. All redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the disclaimer listed in this license in the
+ 2. All redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the disclaimer listed in this license in the
documentation and/or other materials provided with the distribution;
- 3. Any documentation included with all redistributions must include the
+ 3. Any documentation included with all redistributions must include the
following acknowledgement:
- "This product includes software developed at the University of Notre Dame and
- the Pervasive Technology Labs at Indiana University. For technical information
- contact Andrew Lumsdaine at the Pervasive Technology Labs at Indiana University.
- For administrative and license questions contact the Advanced Research and
- Technology Institute at 1100 Waterway Blvd. Indianapolis, Indiana 46202,
+ "This product includes software developed at the University of Notre Dame and
+ the Pervasive Technology Labs at Indiana University. For technical information
+ contact Andrew Lumsdaine at the Pervasive Technology Labs at Indiana University.
+ For administrative and license questions contact the Advanced Research and
+ Technology Institute at 1100 Waterway Blvd. Indianapolis, Indiana 46202,
phone 317-274-5905, fax 317-274-5902."
- Alternatively, this acknowledgement may appear in the software itself, and
+ Alternatively, this acknowledgement may appear in the software itself, and
wherever such third-party acknowledgments normally appear.
- 4. The name "MTL" shall not be used to endorse or promote products derived from
- this software without prior written permission from Indiana University. For
- written permission, please contact Indiana University Advanced Research
+ 4. The name "MTL" shall not be used to endorse or promote products derived from
+ this software without prior written permission from Indiana University. For
+ written permission, please contact Indiana University Advanced Research
& Technology Institute.
- 5. Products derived from this software may not be called "MTL", nor may "MTL"
- appear in their name, without prior written permission of Indiana University
+ 5. Products derived from this software may not be called "MTL", nor may "MTL"
+ appear in their name, without prior written permission of Indiana University
Advanced Research & Technology Institute.
.
- Indiana University provides no reassurances that the source code provided does not infringe the
- patent or any other intellectual property rights of any other entity. Indiana University disclaims
- any liability to any recipient for claims brought by any other entity based on infringement of
+ Indiana University provides no reassurances that the source code provided does not infringe the
+ patent or any other intellectual property rights of any other entity. Indiana University disclaims
+ any liability to any recipient for claims brought by any other entity based on infringement of
intellectual property rights or otherwise.
.
- LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH NO WARRANTIES AS TO CAPABILITIES
- OR ACCURACY ARE MADE. INDIANA UNIVERSITY GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT
- SOFTWARE IS FREE OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR OTHER PROPRIETARY RIGHTS.
- INDIANA UNIVERSITY MAKES NO WARRANTIES THAT SOFTWARE IS FREE FROM "BUGS", "VIRUSES", "TROJAN
- HORSES", "TRAP DOORS", "WORMS", OR OTHER HARMFUL CODE. LICENSEE ASSUMES THE ENTIRE RISK AS TO THE
- PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS, AND TO THE PERFORMANCE AND VALIDITY OF
+ LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH NO WARRANTIES AS TO CAPABILITIES
+ OR ACCURACY ARE MADE. INDIANA UNIVERSITY GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT
+ SOFTWARE IS FREE OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR OTHER PROPRIETARY RIGHTS.
+ INDIANA UNIVERSITY MAKES NO WARRANTIES THAT SOFTWARE IS FREE FROM "BUGS", "VIRUSES", "TROJAN
+ HORSES", "TRAP DOORS", "WORMS", OR OTHER HARMFUL CODE. LICENSEE ASSUMES THE ENTIRE RISK AS TO THE
+ PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS, AND TO THE PERFORMANCE AND VALIDITY OF
INFORMATION GENERATED USING SOFTWARE.
=====================================
debian/patches/0003-Fix-build-with-Boost-1.67.patch
=====================================
@@ -0,0 +1,33 @@
+From: Giovanni Mascellani <gio at debian.org>
+Date: Sat, 3 Nov 2018 21:50:48 +0100
+Bug-Debian: https://bugs.debian.org/912781
+Subject: Fix build with Boost 1.67.
+
+Explicitly including the header boost/serialization/vector.hpp is
+required for automatic serialization of std::vector.
+---
+ src/cxx/libraries/prime/MpiMCMC.cc | 2 +-
+ src/cxx/libraries/prime/MpiMultiGSR.cc | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/src/cxx/libraries/prime/MpiMCMC.cc
++++ b/src/cxx/libraries/prime/MpiMCMC.cc
+@@ -18,7 +18,7 @@
+ #include <cmath>
+ #include <cassert>
+
+-
++#include <boost/serialization/vector.hpp>
+
+
+
+--- a/src/cxx/libraries/prime/MpiMultiGSR.cc
++++ b/src/cxx/libraries/prime/MpiMultiGSR.cc
+@@ -15,6 +15,7 @@
+ #include <sstream>
+ #include <fstream>
+
++#include <boost/serialization/vector.hpp>
+
+ namespace beep
+ {
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
# fix-gcc-6.patch
fix-ftbfs-with-Boost160.patch
fix-gcc-8.patch
+0003-Fix-build-with-Boost-1.67.patch
View it on GitLab: https://salsa.debian.org/med-team/prime-phylo/compare/1b4035c4acdc226fc4ddfe2b86c28c3663e15672...aaf52fc6c9cd53e970b57840de27be39bb17fd90
--
View it on GitLab: https://salsa.debian.org/med-team/prime-phylo/compare/1b4035c4acdc226fc4ddfe2b86c28c3663e15672...aaf52fc6c9cd53e970b57840de27be39bb17fd90
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181104/9c2f6385/attachment-0001.html>
More information about the debian-med-commit
mailing list