Author: tille Date: 2012-05-22 06:17:07 +0000 (Tue, 22 May 2012) New Revision: 10932
Added: trunk/packages/cain/trunk/debian/patches/gcc-4.7.patch Modified: trunk/packages/cain/trunk/debian/changelog trunk/packages/cain/trunk/debian/patches/cain.patch trunk/packages/cain/trunk/debian/patches/series Log: Patch for ftbfs issue (thanks to Matthias Klose) Modified: trunk/packages/cain/trunk/debian/changelog =================================================================== --- trunk/packages/cain/trunk/debian/changelog 2012-05-21 21:22:05 UTC (rev 10931) +++ trunk/packages/cain/trunk/debian/changelog 2012-05-22 06:17:07 UTC (rev 10932) @@ -1,12 +1,15 @@ -cain (1.9-3.1) UNRELEASED; urgency=low +cain (1.9-3) UNRELEASED; urgency=low [ Ivo Maintz ] * added a simple manpage [ Andreas Tille ] * debian/upstream: Add publication information + * debian/patches/gcc-4.7.patch: Fix build failure with GCC 4.7. + (Thanks for the patch to Matthias Klose <[email protected]>) + Closes: #672045 - -- Andreas Tille <[email protected]> Mon, 14 May 2012 14:37:22 +0200 + -- Andreas Tille <[email protected]> Tue, 22 May 2012 07:59:45 +0200 cain (1.9-2) unstable; urgency=low Modified: trunk/packages/cain/trunk/debian/patches/cain.patch =================================================================== --- trunk/packages/cain/trunk/debian/patches/cain.patch 2012-05-21 21:22:05 UTC (rev 10931) +++ trunk/packages/cain/trunk/debian/patches/cain.patch 2012-05-22 06:17:07 UTC (rev 10932) @@ -34,7 +34,7 @@ again: -@@ -17,6 +17,8 @@ distclean: clean +@@ -17,6 +17,8 @@ rm -rf Cain.app/Contents/Resources/simulation rm -rf Cain.app/Contents/Resources/solvers rm -rf Cain.app/Contents/Resources/state @@ -45,7 +45,7 @@ nosetests --with-doctest -v simulation state --- cain-1.9.orig/gui/Application.py +++ cain-1.9/gui/Application.py -@@ -7,6 +7,7 @@ import os.path +@@ -7,6 +7,7 @@ import wx from MainFrame import MainFrame from resourcePath import resourcePath @@ -53,7 +53,7 @@ class Application(wx.App): """The application class for Cain.""" -@@ -14,7 +15,7 @@ class Application(wx.App): +@@ -14,7 +15,7 @@ def __init__(self): """Construct the base class and redirect the output.""" if not sys.platform in ('win32', 'win64'): Added: trunk/packages/cain/trunk/debian/patches/gcc-4.7.patch =================================================================== --- trunk/packages/cain/trunk/debian/patches/gcc-4.7.patch (rev 0) +++ trunk/packages/cain/trunk/debian/patches/gcc-4.7.patch 2012-05-22 06:17:07 UTC (rev 10932) @@ -0,0 +1,15 @@ +Author: Matthias Klose <[email protected]> +Date: Tue, 22 May 2012 00:23:34 +0000 +Description: Fix FTBFS issue when using gcc-4.7 + +--- cain-1.9.orig/src/stochastic/HistogramsAverageAps.h ++++ cain-1.9/src/stochastic/HistogramsAverageAps.h +@@ -159,7 +159,7 @@ + for (typename array::StaticArrayOfArrays<std::size_t>::const_iterator + i = _reactionInfluence.begin(reactionIndex); + i != _reactionInfluence.end(reactionIndex); ++i) { +- sum += _propensitiesFunctor(*i, _state.getPopulations()) - ++ sum += this->_propensitiesFunctor(*i, _state.getPopulations()) - + _discreteGenerator[*i]; + } + // Record the probabilities for this state. Modified: trunk/packages/cain/trunk/debian/patches/series =================================================================== --- trunk/packages/cain/trunk/debian/patches/series 2012-05-21 21:22:05 UTC (rev 10931) +++ trunk/packages/cain/trunk/debian/patches/series 2012-05-22 06:17:07 UTC (rev 10932) @@ -1,2 +1,3 @@ cain.patch eigen.patch +gcc-4.7.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
