[med-svn] [Git][med-team/mrs][master] 4 commits: update for g++7 + boost 1.65 compatibility

Andreas Tille gitlab at salsa.debian.org
Sun Mar 18 15:33:23 UTC 2018 

Andreas Tille pushed to branch master at Debian Med / mrs


Commits:
6713ae06 by Andreas Tille at 2018-03-18T16:26:07+01:00
update for g++7 + boost 1.65 compatibility

- - - - -
d0a4c064 by Andreas Tille at 2018-03-18T16:26:31+01:00
cme fix dpkg-control

- - - - -
0437f2c4 by Andreas Tille at 2018-03-18T16:31:36+01:00
debhelper 11

- - - - -
d3f27ddd by Andreas Tille at 2018-03-18T16:33:11+01:00
Upload to unstable

- - - - -


6 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mrs (6.0.5+dfsg-4) unstable; urgency=medium
+
+  [ Steve Langasek ]
+  * update for g++7 + boost 1.65 compatibility
+    Closes: #893354
+
+  [ Andreas Tille ]
+  * cme fix dpkg-control
+  * debhelper 11
+
+ -- Andreas Tille <tille at debian.org>  Sun, 18 Mar 2018 16:26:54 +0100
+
 mrs (6.0.5+dfsg-3) unstable; urgency=medium
 
   * Moved packaging from SVN to Git


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


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Maarten L. Hekkelman <m.hekkelman at cmbi.ru.nl>,
            Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                libboost-dev,
                libboost-filesystem-dev,
                libboost-system-dev,
@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10),
                libbz2-dev,
                libjs-jquery,
                libjs-jquery-ui
-Standards-Version: 4.1.0
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/mrs.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/mrs.git
 Homepage: http://mrs.cmbi.ru.nl/
@@ -32,7 +32,7 @@ Package: mrs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         lsb-base (>= 3.0-6),
+         lsb-base,
          adduser,
          rsync,
          clustalo,


=====================================
debian/patches/boost-1.65-compat.patch
=====================================
--- /dev/null
+++ b/debian/patches/boost-1.65-compat.patch
@@ -0,0 +1,123 @@
+Description: fix compatibility with boost 1.65
+ Boost 1.65 no longer provides tr1/ headers, which are now provided instead
+ by g++7 directly.  Adjust our includes accordingly.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Last-Modified: 2018-03-18
+
+Index: mrs-6.0.5+dfsg/src/M6Databank.h
+===================================================================
+--- mrs-6.0.5+dfsg.orig/src/M6Databank.h
++++ mrs-6.0.5+dfsg/src/M6Databank.h
+@@ -8,7 +8,7 @@
+ #include <vector>
+ #include <map>
+ #include <set>
+-#include <boost/tr1/tuple.hpp>
++#include <tr1/tuple>
+ 
+ #include "M6File.h"
+ 
+Index: mrs-6.0.5+dfsg/src/M6BlastCache.h
+===================================================================
+--- mrs-6.0.5+dfsg.orig/src/M6BlastCache.h
++++ mrs-6.0.5+dfsg/src/M6BlastCache.h
+@@ -10,7 +10,7 @@
+ #include <boost/thread.hpp>
+ #include <boost/thread/condition.hpp>
+ #include <boost/filesystem/path.hpp>
+-#include <boost/tr1/tuple.hpp>
++#include <tr1/tuple>
+ 
+ #include "M6Blast.h"
+ 
+Index: mrs-6.0.5+dfsg/src/M6Builder.h
+===================================================================
+--- mrs-6.0.5+dfsg.orig/src/M6Builder.h
++++ mrs-6.0.5+dfsg/src/M6Builder.h
+@@ -10,7 +10,7 @@
+ 
+ #include <boost/filesystem/path.hpp>
+ #include <boost/thread.hpp>
+-#include <boost/tr1/tuple.hpp>
++#include <tr1/tuple>
+ #include <zeep/xml/node.hpp>
+ 
+ #include "M6Lexicon.h"
+Index: mrs-6.0.5+dfsg/src/M6CmdLineDriver.cpp
+===================================================================
+--- mrs-6.0.5+dfsg.orig/src/M6CmdLineDriver.cpp
++++ mrs-6.0.5+dfsg/src/M6CmdLineDriver.cpp
+@@ -16,7 +16,7 @@
+ #include <boost/foreach.hpp>
+ #define foreach BOOST_FOREACH
+ //#include <boost/timer/timer.hpp>
+-#include <boost/tr1/tuple.hpp>
++#include <tr1/tuple>
+ #include <boost/algorithm/string.hpp>
+ 
+ #include "M6Builder.h"
+Index: mrs-6.0.5+dfsg/src/M6Iterator.h
+===================================================================
+--- mrs-6.0.5+dfsg.orig/src/M6Iterator.h
++++ mrs-6.0.5+dfsg/src/M6Iterator.h
+@@ -8,7 +8,7 @@
+ #include <vector>
+ #include <algorithm>
+ #include <boost/filesystem/path.hpp>
+-#include <boost/tr1/tuple.hpp>
++#include <tr1/tuple>
+ 
+ #include "M6BitStream.h"
+ #include "M6File.h"
+Index: mrs-6.0.5+dfsg/src/M6Server.h
+===================================================================
+--- mrs-6.0.5+dfsg.orig/src/M6Server.h
++++ mrs-6.0.5+dfsg/src/M6Server.h
+@@ -9,7 +9,7 @@
+ #include <map>
+ #include <set>
+ 
+-#include <boost/tr1/tuple.hpp>
++#include <tr1/tuple>
+ 
+ #include <zeep/http/webapp.hpp>
+ #include <zeep/http/webapp/el.hpp>
+Index: mrs-6.0.5+dfsg/src/M6Server.cpp
+===================================================================
+--- mrs-6.0.5+dfsg.orig/src/M6Server.cpp
++++ mrs-6.0.5+dfsg/src/M6Server.cpp
+@@ -14,7 +14,7 @@
+ #include <numeric>
+ 
+ #include <boost/bind.hpp>
+-#include <boost/tr1/cmath.hpp>
++#include <tr1/cmath>
+ #include <boost/foreach.hpp>
+ #define foreach BOOST_FOREACH
+ #include <boost/filesystem/fstream.hpp>
+Index: mrs-6.0.5+dfsg/src/M6Tokenizer.cpp
+===================================================================
+--- mrs-6.0.5+dfsg.orig/src/M6Tokenizer.cpp
++++ mrs-6.0.5+dfsg/src/M6Tokenizer.cpp
+@@ -11,7 +11,7 @@
+ #include <iterator>
+ #include <algorithm>
+ 
+-#include <boost/tr1/tuple.hpp>
++#include <tr1/tuple>
+ #include <boost/foreach.hpp>
+ #define foreach BOOST_FOREACH
+ 
+Index: mrs-6.0.5+dfsg/src/M6WSSearch.cpp
+===================================================================
+--- mrs-6.0.5+dfsg.orig/src/M6WSSearch.cpp
++++ mrs-6.0.5+dfsg/src/M6WSSearch.cpp
+@@ -10,7 +10,7 @@
+ #include <zeep/dispatcher.hpp>
+ 
+ #include <boost/bind.hpp>
+-#include <boost/tr1/cmath.hpp>
++#include <tr1/cmath>
+ #include <boost/foreach.hpp>
+ #define foreach BOOST_FOREACH
+ #include <boost/filesystem/fstream.hpp>


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 makefile.diff
 init_d.diff
 gcc-6.patch
+boost-1.65-compat.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DH_VERBOSE := 1
 
 %:
-	dh $@ --parallel
+	dh $@
 
 override_dh_auto_configure:
 	./configure --prefix=/usr --config-dir=/etc/mrs/ \



View it on GitLab: https://salsa.debian.org/med-team/mrs/compare/1b3351d00379ce2ba9b64c909e06f966364d9493...d3f27ddd04b550e961ca95600a3061b5b6cd947e

---
View it on GitLab: https://salsa.debian.org/med-team/mrs/compare/1b3351d00379ce2ba9b64c909e06f966364d9493...d3f27ddd04b550e961ca95600a3061b5b6cd947e
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/20180318/73685365/attachment-0001.html>

More information about the debian-med-commit mailing list