[med-svn] [Git][med-team/progressivemauve][master] 4 commits: Fix FTBFS with boost1.67

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / progressivemauve


Commits:
56a72a26 by Andreas Tille at 2018-12-04T08:59:36Z
Fix FTBFS with boost1.67

- - - - -
2e3ec76b by Andreas Tille at 2018-12-04T09:00:15Z
Standards-Version: 4.2.1

- - - - -
20fea679 by Andreas Tille at 2018-12-04T09:03:14Z
Fix line endings

- - - - -
eacf86aa by Andreas Tille at 2018-12-04T09:07:50Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/fix_FTBFS_boost1.67.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+progressivemauve (1.2.0+4713+dfsg-4) unstable; urgency=medium
+
+  [ Giovanni Mascellani ]
+  * Fix FTBFS with boost1.67
+    Closes: #914049
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.2.1
+
+ -- Andreas Tille <tille at debian.org>  Tue, 04 Dec 2018 10:03:31 +0100
+
 progressivemauve (1.2.0+4713+dfsg-3) unstable; urgency=medium
 
   * Point Vcs fields to salsa.debian.org


=====================================
debian/control
=====================================
@@ -12,8 +12,8 @@ Build-Depends: debhelper (>= 11~),
                libboost-iostreams-dev,
                libgenome-dev,
                libmuscle-dev,
-               libmems-dev (>= 1.6.0+4725-7~)
-Standards-Version: 4.1.5
+               libmems-dev
+Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/med-team/progressivemauve
 Vcs-Git: https://salsa.debian.org/med-team/progressivemauve.git
 Homepage: http://darlinglab.org/mauve/user-guide/mauvealigner.html


=====================================
debian/patches/fix_FTBFS_boost1.67.patch
=====================================
@@ -0,0 +1,19 @@
+Author: Giovanni Mascellani <gio at debian.org>
+Bug-Debian: https://bugs.debian.org/914049
+Subject: Fix FTBFS with boost1.67
+
+Make an explicit call to the constructor for NeighborhoodGroup (which is
+an alias for a specialization of boost::tuple), which is not marked
+as "explicit".
+
+--- a/src/repeatoire.cpp
++++ b/src/repeatoire.cpp
+@@ -1591,7 +1591,7 @@ void processNovelSubsetMatches( GappedMa
+ 		getSubsets(M_j,-direction*ni_parity*nj_parity).push_back(nj_link);
+         //getExtraSubsets(M_j,-direction*ni_parity*nj_parity).push_back(nj_link);
+ 		// push M_n onto the heap
+-		novel_subset_list.push_back(M_n);
++		novel_subset_list.push_back(NeighborhoodGroup{M_n});
+ 		//procrastination_queue.push(M_n);
+ 		novel_subset_count++;
+ 	}


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ do_not_build_static_binaries.patch
 spelling.patch
 use-native-getopt.patch
 adapt-to-unversioned-libs.patch
+fix_FTBFS_boost1.67.patch



View it on GitLab: https://salsa.debian.org/med-team/progressivemauve/compare/264cad146c48537b35fa8365e9137905785f8a21...eacf86aa8266157fc4263d389c9a137aec6dd195

-- 
View it on GitLab: https://salsa.debian.org/med-team/progressivemauve/compare/264cad146c48537b35fa8365e9137905785f8a21...eacf86aa8266157fc4263d389c9a137aec6dd195
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/20181204/6479f29f/attachment-0001.html>