[med-svn] [cain] 02/07: Refresh patches
Andreas Tille
tille at debian.org
Thu Dec 17 21:35:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository cain.
commit 6d07ec5c454d337fdf7348174090f7686405cdb7
Author: Andreas Tille <tille at debian.org>
Date: Thu Dec 17 20:41:51 2015 +0100
Refresh patches
---
debian/patches/cain.patch | 40 +++++++++++-----------------------------
debian/patches/eigen3.patch | 2 +-
debian/patches/gcc-4.7.patch | 6 +++---
debian/patches/hardening.patch | 15 ---------------
debian/patches/help.patch | 4 ++--
debian/patches/series | 1 -
6 files changed, 17 insertions(+), 51 deletions(-)
diff --git a/debian/patches/cain.patch b/debian/patches/cain.patch
index 46100dd..356389b 100644
--- a/debian/patches/cain.patch
+++ b/debian/patches/cain.patch
@@ -6,8 +6,8 @@ Description: Fix some build issues
Author: Ivo Maintz <ivo at maintz.de>
Date: Wed, 28 Sep 2011 12:02:11 +0200
---- cain-1.9.orig/Makefile
-+++ cain-1.9/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -2,7 +2,7 @@
# By default make the solvers.
@@ -17,18 +17,9 @@ Date: Wed, 28 Sep 2011 12:02:11 +0200
again:
-@@ -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
-+ rm -f solvers/*
-+ rm -f src/solvers/*.d
-
- test:
- nosetests --with-doctest -v simulation state
---- cain-1.9.orig/gui/Application.py
-+++ cain-1.9/gui/Application.py
-@@ -7,6 +7,7 @@
+--- a/gui/Application.py
++++ b/gui/Application.py
+@@ -8,6 +8,7 @@ import os.path
import wx
from MainFrame import MainFrame
from resourcePath import resourcePath
@@ -36,17 +27,8 @@ Date: Wed, 28 Sep 2011 12:02:11 +0200
class Application(wx.App):
"""The application class for Cain."""
-@@ -14,7 +15,7 @@
- def __init__(self):
- """Construct the base class and redirect the output."""
- if not sys.platform in ('win32', 'win64'):
-- wx.App.__init__(self, redirect=True, filename="ErrorLog.txt")
-+ wx.App.__init__(self, redirect=True, filename=join(expanduser('~'),".cain","ErrorLog.txt"))
- else:
- # On windows we might not have write permission for the log file.
- wx.App.__init__(self)
---- cain-1.9.orig/src/ads/indexedPriorityQueue/IndexedPriorityQueueBinaryHeap.h
-+++ cain-1.9/src/ads/indexedPriorityQueue/IndexedPriorityQueueBinaryHeap.h
+--- a/src/ads/indexedPriorityQueue/IndexedPriorityQueueBinaryHeap.h
++++ b/src/ads/indexedPriorityQueue/IndexedPriorityQueueBinaryHeap.h
@@ -9,7 +9,7 @@
#define __ads_indexedPriorityQueue_IndexedPriorityQueueBinaryHeap_h__
@@ -55,14 +37,14 @@ Date: Wed, 28 Sep 2011 12:02:11 +0200
+#include <stddef.h>
#include <iostream>
- namespace ads {
---- cain-1.9.orig/src/ads/indexedPriorityQueue/IndexedPriorityQueueBinaryHeapPair.h
-+++ cain-1.9/src/ads/indexedPriorityQueue/IndexedPriorityQueueBinaryHeapPair.h
+ #include <cstddef>
+--- a/src/ads/indexedPriorityQueue/IndexedPriorityQueueBinaryHeapPair.h
++++ b/src/ads/indexedPriorityQueue/IndexedPriorityQueueBinaryHeapPair.h
@@ -9,6 +9,7 @@
#define __ads_indexedPriorityQueue_IndexedPriorityQueueBinaryHeapPair_h__
#include "IndexedPriorityQueueBase.h"
+#include <stddef.h>
- namespace ads {
+ #include <cstddef>
diff --git a/debian/patches/eigen3.patch b/debian/patches/eigen3.patch
index 30dd1a2..0dbd9df 100644
--- a/debian/patches/eigen3.patch
+++ b/debian/patches/eigen3.patch
@@ -18,7 +18,7 @@ Last-Update: 2013-10-13 (Anton Gladky <gladk at debian.org>, move to Eigen3)
--- a/src/stochastic/TauLeapingImplicit.ipp
+++ b/src/stochastic/TauLeapingImplicit.ipp
-@@ -153,10 +153,10 @@
+@@ -153,10 +153,10 @@ stepEuler(const double tau) {
//std::cout << "Jacobian =\n" << jacobian << '\n'
//<< "f = \n" << f << '\n';
Eigen::VectorXd delta(N);
diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch
index df0b207..a60555a 100644
--- a/debian/patches/gcc-4.7.patch
+++ b/debian/patches/gcc-4.7.patch
@@ -2,9 +2,9 @@ Author: Matthias Klose <doko at debian.org>
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 @@
+--- a/src/stochastic/HistogramsAverageAps.h
++++ b/src/stochastic/HistogramsAverageAps.h
+@@ -159,7 +159,7 @@ public:
for (typename array::StaticArrayOfArrays<std::size_t>::const_iterator
i = _reactionInfluence.begin(reactionIndex);
i != _reactionInfluence.end(reactionIndex); ++i) {
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
deleted file mode 100644
index 84b5fae..0000000
--- a/debian/patches/hardening.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Propagate hardening flags
-Author: Andreas Tille <tille at debian.org>
-Date: Tue, 22 May 2012 07:59:45 +0200
-
---- cain-1.9.orig/src/solvers/Makefile
-+++ cain-1.9/src/solvers/Makefile
-@@ -51,7 +51,7 @@
- # Implicit rules.
-
- .cc.d:
-- $(CXX) -MM $(CXXINCLUDE) $< > $@.$$$$; \
-+ $(CXX) $(CPPFLAGS) -MM $(CXXFLAGS) $(LDFLAGS) $< > $@.$$$$; \
- sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
- $(RM) $@.$$$$
-
diff --git a/debian/patches/help.patch b/debian/patches/help.patch
index 10bc483..83fb598 100644
--- a/debian/patches/help.patch
+++ b/debian/patches/help.patch
@@ -8,8 +8,8 @@ Author: Ivo Maintz <ivo at maintz.de>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1032304
Last-Update: Fri, 10 Aug 2012 11:40:11 +0200
---- cain-1.9.orig/help/UserSolvers.htm
-+++ cain-1.9/help/UserSolvers.htm
+--- a/help/UserSolvers.htm
++++ b/help/UserSolvers.htm
@@ -221,14 +221,14 @@ The methods that require exponential dev
is generated by a linear search on the groups followed by selecting
a reaction within a group with the method of rejection.
diff --git a/debian/patches/series b/debian/patches/series
index b61e962..4225ef6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
cain.patch
eigen3.patch
gcc-4.7.patch
-hardening.patch
help.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cain.git
More information about the debian-med-commit
mailing list