[ecflow] 06/11: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Oct 25 11:03:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository ecflow.
commit 465a36b5785df882fc9b91a034c176f88776cbae
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Oct 13 12:14:50 2017 +0100
refresh patches
---
debian/patches/auto_ptr.patch | 189 +++++++++++++++++------------------
debian/patches/format-security.patch | 6 +-
debian/patches/gcc7-fixes.patch | 12 +--
debian/patches/minver.patch | 8 +-
debian/patches/python3.patch | 41 +++-----
debian/patches/reproducible.patch | 6 +-
debian/patches/set-paths.patch | 6 +-
debian/patches/soname.patch | 8 +-
8 files changed, 130 insertions(+), 146 deletions(-)
diff --git a/debian/patches/auto_ptr.patch b/debian/patches/auto_ptr.patch
index 1be1a95..80828fc 100644
--- a/debian/patches/auto_ptr.patch
+++ b/debian/patches/auto_ptr.patch
@@ -3,10 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2017-03-22
Forwarded: no
-Index: ecflow-4.6.1/ANode/src/ExprDuplicate.cpp
+Index: ecflow-4.7.0/ANode/src/ExprDuplicate.cpp
===================================================================
---- ecflow-4.6.1.orig/ANode/src/ExprDuplicate.cpp
-+++ ecflow-4.6.1/ANode/src/ExprDuplicate.cpp
+--- ecflow-4.7.0.orig/ANode/src/ExprDuplicate.cpp
++++ ecflow-4.7.0/ANode/src/ExprDuplicate.cpp
@@ -45,13 +45,13 @@ ExprDuplicate::~ExprDuplicate()
duplicate_expr.clear();
}
@@ -24,10 +24,10 @@ Index: ecflow-4.6.1/ANode/src/ExprDuplicate.cpp
}
void ExprDuplicate::add(const std::string& expr,AstTop* ast)
-Index: ecflow-4.6.1/ANode/src/ExprDuplicate.hpp
+Index: ecflow-4.7.0/ANode/src/ExprDuplicate.hpp
===================================================================
---- ecflow-4.6.1.orig/ANode/src/ExprDuplicate.hpp
-+++ ecflow-4.6.1/ANode/src/ExprDuplicate.hpp
+--- ecflow-4.7.0.orig/ANode/src/ExprDuplicate.hpp
++++ ecflow-4.7.0/ANode/src/ExprDuplicate.hpp
@@ -24,7 +24,7 @@
// =========================================================================
@@ -46,32 +46,10 @@ Index: ecflow-4.6.1/ANode/src/ExprDuplicate.hpp
// Add the expr to the map, the ast is cloned.
static void add(const std::string& expr,AstTop*);
-Index: ecflow-4.6.1/ANode/src/NodeChange.cpp
+Index: ecflow-4.7.0/ANode/src/Expression.cpp
===================================================================
---- ecflow-4.6.1.orig/ANode/src/NodeChange.cpp
-+++ ecflow-4.6.1/ANode/src/NodeChange.cpp
-@@ -101,7 +101,7 @@ void Node::changeTrigger(const std::stri
- {
- PartExpression part(expression);
- string parseErrorMsg;
-- std::auto_ptr<AstTop> ast = part.parseExpressions( parseErrorMsg );
-+ std::unique_ptr<AstTop> ast = part.parseExpressions( parseErrorMsg );
- if (!ast.get()) {
- std::stringstream ss;
- ss << "Node::changeTrigger: Failed to parse expression '" << expression << "'. " << parseErrorMsg;
-@@ -123,7 +123,7 @@ void Node::changeComplete(const std::str
- {
- PartExpression part(expression);
- string parseErrorMsg;
-- std::auto_ptr<AstTop> ast = part.parseExpressions( parseErrorMsg );
-+ std::unique_ptr<AstTop> ast = part.parseExpressions( parseErrorMsg );
- if (!ast.get()) {
- std::stringstream ss;
- ss << "Node::changeComplete: Failed to parse expression '" << expression << "'. " << parseErrorMsg;
-Index: ecflow-4.6.1/ANode/src/Expression.cpp
-===================================================================
---- ecflow-4.6.1.orig/ANode/src/Expression.cpp
-+++ ecflow-4.6.1/ANode/src/Expression.cpp
+--- ecflow-4.7.0.orig/ANode/src/Expression.cpp
++++ ecflow-4.7.0/ANode/src/Expression.cpp
@@ -65,7 +65,7 @@ std::ostream& PartExpression::print(std:
return os;
}
@@ -90,7 +68,7 @@ Index: ecflow-4.6.1/ANode/src/Expression.cpp
if (errorMsg.empty()) LOG_ASSERT(ast.get(),"");
else LOG_ASSERT(!ast.get(), "");
-@@ -83,28 +83,28 @@ std::auto_ptr<AstTop> PartExpression::pa
+@@ -83,35 +83,35 @@ std::auto_ptr<AstTop> PartExpression::pa
return ast;
}
}
@@ -122,9 +100,32 @@ Index: ecflow-4.6.1/ANode/src/Expression.cpp
-: vec_(rhs.vec_), makeFree_(rhs.makeFree_), state_change_no_(0),theCombinedAst_(0) {}
+: vec_(rhs.vec_), makeFree_(rhs.makeFree_), state_change_no_(0) ,theCombinedAst_(0) {}
- std::ostream& Expression::print(std::ostream& os, const std::string& exprType) const
+
+-std::auto_ptr<AstTop> Expression::parse(const std::string& expression_to_parse,const std::string& error_msg_context)
++std::unique_ptr<AstTop> Expression::parse(const std::string& expression_to_parse,const std::string& error_msg_context)
{
-@@ -156,7 +156,7 @@ void Expression::createAST( Node* node,
+ PartExpression exp(expression_to_parse);
+ string parseErrorMsg;
+- std::auto_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
++ std::unique_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
+ if (!ast.get()) {
+ std::stringstream ss; ss << error_msg_context << " Failed to parse expression '" << expression_to_parse << "'. " << parseErrorMsg;
+ throw std::runtime_error( ss.str() ) ;
+@@ -119,11 +119,11 @@ std::auto_ptr<AstTop> Expression::parse(
+ return ast;
+ }
+
+-std::auto_ptr<AstTop> Expression::parse_no_throw(const std::string& expression_to_parse,std::string& error_msg_context)
++std::unique_ptr<AstTop> Expression::parse_no_throw(const std::string& expression_to_parse,std::string& error_msg_context)
+ {
+ PartExpression exp(expression_to_parse);
+ string parseErrorMsg;
+- std::auto_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
++ std::unique_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
+ if (!ast.get()) {
+ std::stringstream ss; ss << error_msg_context << " Failed to parse expression '" << expression_to_parse << "'. " << parseErrorMsg;
+ error_msg_context = ss.str();
+@@ -181,7 +181,7 @@ void Expression::createAST( Node* node,
size_t theSize = vec_.size();
for(size_t i = 0; i < theSize; i++) {
std::string localErrorMsg;
@@ -133,7 +134,7 @@ Index: ecflow-4.6.1/ANode/src/Expression.cpp
if ( ast.get() ) {
// We can have multiple trigger/complete expression, combine to a single AST tree
-@@ -183,13 +183,13 @@ void Expression::createAST( Node* node,
+@@ -208,13 +208,13 @@ void Expression::createAST( Node* node,
// Since we have transferred over root2 it must be set to NULL for top2,
// to avoid its child destruction
@@ -149,10 +150,10 @@ Index: ecflow-4.6.1/ANode/src/Expression.cpp
theCombinedAst_->exprType(exprType);
}
// cout << "****************************************************************\n";
-Index: ecflow-4.6.1/ANode/src/ExprParser.hpp
+Index: ecflow-4.7.0/ANode/src/ExprParser.hpp
===================================================================
---- ecflow-4.6.1.orig/ANode/src/ExprParser.hpp
-+++ ecflow-4.6.1/ANode/src/ExprParser.hpp
+--- ecflow-4.7.0.orig/ANode/src/ExprParser.hpp
++++ ecflow-4.7.0/ANode/src/ExprParser.hpp
@@ -17,7 +17,7 @@
//============================================================================
@@ -192,32 +193,32 @@ Index: ecflow-4.6.1/ANode/src/ExprParser.hpp
};
#endif
-Index: ecflow-4.6.1/Base/src/cts/AlterCmd.cpp
+Index: ecflow-4.7.0/Base/src/cts/AlterCmd.cpp
===================================================================
---- ecflow-4.6.1.orig/Base/src/cts/AlterCmd.cpp
-+++ ecflow-4.6.1/Base/src/cts/AlterCmd.cpp
-@@ -1004,7 +1004,7 @@ void AlterCmd::createChange( Cmd_ptr& cm
- // Parse the expression
- PartExpression exp(name);
- string parseErrorMsg;
-- std::auto_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
-+ std::unique_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
- if (!ast.get()) {
- ss << "AlterCmd: change trigger: Failed to parse expression '" << name << "'. " << parseErrorMsg << "\n";
- ss << dump_args(options,paths) << "\n";
-@@ -1024,7 +1024,7 @@ void AlterCmd::createChange( Cmd_ptr& cm
- // Parse the expression
- PartExpression exp(name);
- string parseErrorMsg;
-- std::auto_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
-+ std::unique_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
- if (!ast.get()) {
- ss << "AlterCmd: change complete: Failed to parse expression '" << name << "'. " << parseErrorMsg << "\n";
- ss << dump_args(options,paths) << "\n";
-Index: ecflow-4.6.1/view/src/host.cc
+--- ecflow-4.7.0.orig/Base/src/cts/AlterCmd.cpp
++++ ecflow-4.7.0/Base/src/cts/AlterCmd.cpp
+@@ -1012,7 +1012,7 @@ void AlterCmd::createChange( Cmd_ptr& cm
+ name = options[2];
+
+ std::string error_msg = "AlterCmd: change trigger:";
+- std::auto_ptr<AstTop> ast = Expression::parse_no_throw(name,error_msg);
++ std::unique_ptr<AstTop> ast = Expression::parse_no_throw(name,error_msg);
+ if (!ast.get()) {
+ ss << error_msg << "\n" << dump_args(options,paths) << "\n";
+ throw std::runtime_error( ss.str() );
+@@ -1029,7 +1029,7 @@ void AlterCmd::createChange( Cmd_ptr& cm
+ name = options[2];
+
+ std::string error_msg = "AlterCmd: change complete:";
+- std::auto_ptr<AstTop> ast = Expression::parse_no_throw(name,error_msg);
++ std::unique_ptr<AstTop> ast = Expression::parse_no_throw(name,error_msg);
+ if (!ast.get()) {
+ ss << error_msg << "\n" << dump_args(options,paths) << "\n";
+ throw std::runtime_error( ss.str() );
+Index: ecflow-4.7.0/view/src/host.cc
===================================================================
---- ecflow-4.6.1.orig/view/src/host.cc
-+++ ecflow-4.6.1/view/src/host.cc
+--- ecflow-4.7.0.orig/view/src/host.cc
++++ ecflow-4.7.0/view/src/host.cc
@@ -578,7 +578,7 @@ void host::dir( node& n, const char* pat
{
gui::message("%s: fetching file list", this->name());
@@ -245,32 +246,10 @@ Index: ecflow-4.6.1/view/src/host.cc
if (ldir.get()) {
l.scan(ldir.get());
}
-Index: ecflow-4.6.1/Base/src/cts/TaskCmds.cpp
+Index: ecflow-4.7.0/ANode/src/Expression.hpp
===================================================================
---- ecflow-4.6.1.orig/Base/src/cts/TaskCmds.cpp
-+++ ecflow-4.6.1/Base/src/cts/TaskCmds.cpp
-@@ -413,7 +413,7 @@ CtsWaitCmd::CtsWaitCmd(const std::string
- // Parse expression to make sure its valid
- PartExpression exp(expression);
- string parseErrorMsg;
-- std::auto_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
-+ std::unique_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
- if (!ast.get()) {
-
- assert( !parseErrorMsg.empty() );
-@@ -444,7 +444,7 @@ STC_Cmd_ptr CtsWaitCmd::doHandleRequest(
- // Parse the expression
- PartExpression exp(expression_);
- string parseErrorMsg;
-- std::auto_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
-+ std::unique_ptr<AstTop> ast = exp.parseExpressions( parseErrorMsg );
- if (!ast.get()) {
- // should NOT really, since client did check
- std::stringstream ss; ss << "CtsWaitCmd: Failed to parse expression '" << expression_ << "'. " << parseErrorMsg;
-Index: ecflow-4.6.1/ANode/src/Expression.hpp
-===================================================================
---- ecflow-4.6.1.orig/ANode/src/Expression.hpp
-+++ ecflow-4.6.1/ANode/src/Expression.hpp
+--- ecflow-4.7.0.orig/ANode/src/Expression.hpp
++++ ecflow-4.7.0/ANode/src/Expression.hpp
@@ -17,7 +17,7 @@
//============================================================================
@@ -289,7 +268,7 @@ Index: ecflow-4.6.1/ANode/src/Expression.hpp
private:
std::string exp_;
-@@ -135,10 +135,10 @@ private:
+@@ -145,10 +145,10 @@ private:
// They are created on demand. reasons:
// 1/ Help with AIX serialisation
// 2/ Help to reduce network traffic
@@ -302,11 +281,11 @@ Index: ecflow-4.6.1/ANode/src/Expression.hpp
Expression& operator=(Expression const& f);
private:
-Index: ecflow-4.6.1/ANode/test/TestExprParser.cpp
+Index: ecflow-4.7.0/ANode/test/TestExprParser.cpp
===================================================================
---- ecflow-4.6.1.orig/ANode/test/TestExprParser.cpp
-+++ ecflow-4.6.1/ANode/test/TestExprParser.cpp
-@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE( test_expression_pa
+--- ecflow-4.7.0.orig/ANode/test/TestExprParser.cpp
++++ ecflow-4.7.0/ANode/test/TestExprParser.cpp
+@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE( test_expression_pa
PartExpression part(vec[i]);
string parseErrorMsg;
@@ -315,7 +294,7 @@ Index: ecflow-4.6.1/ANode/test/TestExprParser.cpp
BOOST_REQUIRE_MESSAGE(ast.get(),"Failed to parse\n" << vec[i] << " " << parseErrorMsg);
std::stringstream s2;
-@@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE( test_expression_pa
+@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE( test_expression_pa
PartExpression part(vec[i]);
string parseErrorMsg;
@@ -324,11 +303,11 @@ Index: ecflow-4.6.1/ANode/test/TestExprParser.cpp
BOOST_REQUIRE_MESSAGE(ast.get(),"Failed to parse " << vec[i] << " " << parseErrorMsg);
std::stringstream s2;
-Index: ecflow-4.6.1/ANode/src/ExprParser.cpp
+Index: ecflow-4.7.0/ANode/src/ExprParser.cpp
===================================================================
---- ecflow-4.6.1.orig/ANode/src/ExprParser.cpp
-+++ ecflow-4.6.1/ANode/src/ExprParser.cpp
-@@ -1000,7 +1000,7 @@ AstTop* createTopAst(
+--- ecflow-4.7.0.orig/ANode/src/ExprParser.cpp
++++ ecflow-4.7.0/ANode/src/ExprParser.cpp
+@@ -1016,7 +1016,7 @@ AstTop* createTopAst(
std::cout << "\nPRINT_AST_TRAVERSAL " << expr << "\n";
#endif
@@ -337,3 +316,19 @@ Index: ecflow-4.6.1/ANode/src/ExprParser.cpp
(void)doCreateAst(info.trees.begin(),rule_names,ast.get() );
if (!ast->is_valid_ast(error_msg)) {
+Index: ecflow-4.7.0/ANode/src/Node.cpp
+===================================================================
+--- ecflow-4.7.0.orig/ANode/src/Node.cpp
++++ ecflow-4.7.0/ANode/src/Node.cpp
+@@ -1340,9 +1340,9 @@ bool Node::check_expressions(Ast* ast,co
+ return true;
+ }
+
+-std::auto_ptr<AstTop> Node::parse_and_check_expressions(const std::string& expr, bool trigger, const std::string& context)
++std::unique_ptr<AstTop> Node::parse_and_check_expressions(const std::string& expr, bool trigger, const std::string& context)
+ {
+- std::auto_ptr<AstTop> ast = Expression::parse(expr,context ); // will throw for errors
++ std::unique_ptr<AstTop> ast = Expression::parse(expr,context ); // will throw for errors
+
+ std::string errorMsg;
+ if (!check_expressions(ast.get(),expr,trigger,errorMsg)) {
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
index b0d0409..33e9e0e 100644
--- a/debian/patches/format-security.patch
+++ b/debian/patches/format-security.patch
@@ -3,10 +3,10 @@ Description: Fix for security-format flaw
Last-Updated: 2017-07-10
Forwarded: no
-Index: ecflow-4.5.0/view/src/time.cc
+Index: ecflow-4.7.0/view/src/time.cc
===================================================================
---- ecflow-4.5.0.orig/view/src/time.cc
-+++ ecflow-4.5.0/view/src/time.cc
+--- ecflow-4.7.0.orig/view/src/time.cc
++++ ecflow-4.7.0/view/src/time.cc
@@ -132,7 +132,7 @@ char* time_node::string(char* s)
return s;
}
diff --git a/debian/patches/gcc7-fixes.patch b/debian/patches/gcc7-fixes.patch
index 5a3d7a5..13f27c0 100644
--- a/debian/patches/gcc7-fixes.patch
+++ b/debian/patches/gcc7-fixes.patch
@@ -3,10 +3,10 @@ Description: Fix ambiguous statements now choking on g++7
Last-Updated: 2017-09-09
Forwarded: no
-Index: ecflow-4.6.1/view/src/host.cc
+Index: ecflow-4.7.0/view/src/host.cc
===================================================================
---- ecflow-4.6.1.orig/view/src/host.cc
-+++ ecflow-4.6.1/view/src/host.cc
+--- ecflow-4.7.0.orig/view/src/host.cc
++++ ecflow-4.7.0/view/src/host.cc
@@ -261,12 +261,13 @@ void host::logout( const std::string& na
if (h) h->logout();
}
@@ -67,10 +67,10 @@ Index: ecflow-4.6.1/view/src/host.cc
}
}
-Index: ecflow-4.6.1/view/src/host.h
+Index: ecflow-4.7.0/view/src/host.h
===================================================================
---- ecflow-4.6.1.orig/view/src/host.h
-+++ ecflow-4.6.1/view/src/host.h
+--- ecflow-4.7.0.orig/view/src/host.h
++++ ecflow-4.7.0/view/src/host.h
@@ -104,6 +104,7 @@ class host : public extent<host>
, public configurable
, public observable
diff --git a/debian/patches/minver.patch b/debian/patches/minver.patch
index 89d62b2..e682889 100644
--- a/debian/patches/minver.patch
+++ b/debian/patches/minver.patch
@@ -5,11 +5,11 @@ Author: Alastair McKinstry <mckinstry at debiab.r
Last-Updated: 2017-07-11
Forwarded: no
-Index: ecflow-4.6.1/CMakeLists.txt
+Index: ecflow-4.7.0/CMakeLists.txt
===================================================================
---- ecflow-4.6.1.orig/CMakeLists.txt
-+++ ecflow-4.6.1/CMakeLists.txt
-@@ -283,7 +283,7 @@ if (ENABLE_SERVER)
+--- ecflow-4.7.0.orig/CMakeLists.txt
++++ ecflow-4.7.0/CMakeLists.txt
+@@ -293,7 +293,7 @@ if (ENABLE_SERVER)
endif()
if (ENABLE_PYTHON)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index d681e41..ce1a8fa 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,10 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Forwarded: no
Last-Updated: 2017-09-09
-Index: ecflow-4.6.1/Pyext/script.py
+Index: ecflow-4.7.0/Pyext/script.py
===================================================================
---- ecflow-4.6.1.orig/Pyext/script.py
-+++ ecflow-4.6.1/Pyext/script.py
+--- ecflow-4.7.0.orig/Pyext/script.py
++++ ecflow-4.7.0/Pyext/script.py
@@ -7,5 +7,7 @@
#
@@ -16,10 +16,10 @@ Index: ecflow-4.6.1/Pyext/script.py
+
+print ('Hello World !')
number = 42
-Index: ecflow-4.6.1/tools/ecflow_fuse.py
+Index: ecflow-4.7.0/tools/ecflow_fuse.py
===================================================================
---- ecflow-4.6.1.orig/tools/ecflow_fuse.py
-+++ ecflow-4.6.1/tools/ecflow_fuse.py
+--- ecflow-4.7.0.orig/tools/ecflow_fuse.py
++++ ecflow-4.7.0/tools/ecflow_fuse.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -227,10 +227,10 @@ Index: ecflow-4.6.1/tools/ecflow_fuse.py
return [ "..", "." ]
# raise BaseException()
# return ["-empty-%s" % path.replace("/", "_") ]
-Index: ecflow-4.6.1/Pyext/unicode.py
+Index: ecflow-4.7.0/Pyext/unicode.py
===================================================================
---- ecflow-4.6.1.orig/Pyext/unicode.py
-+++ ecflow-4.6.1/Pyext/unicode.py
+--- ecflow-4.7.0.orig/Pyext/unicode.py
++++ ecflow-4.7.0/Pyext/unicode.py
@@ -1,7 +1,7 @@
# Determine the python unicode
-
@@ -243,21 +243,10 @@ Index: ecflow-4.6.1/Pyext/unicode.py
- print 'UCS2 build'
\ No newline at end of file
+ print ('UCS2 build')
-Index: ecflow-4.6.1/Pyext/test/py_u_TestAutoAddExtern.py
+Index: ecflow-4.7.0/Pyext/samples/api/sms2ecf.py
===================================================================
---- ecflow-4.6.1.orig/Pyext/test/py_u_TestAutoAddExtern.py
-+++ ecflow-4.6.1/Pyext/test/py_u_TestAutoAddExtern.py
-@@ -45,5 +45,5 @@ if __name__ == "__main__":
- f2.add_task("t").add_inlimit("sg1","/suiteName"); check_then_auto_add_extern(defs)
- f2.add_task("t1").add_inlimit("hpcd","/obs/limits"); check_then_auto_add_extern(defs)
- f2.add_task("t2").add_inlimit("c1a","/limits"); check_then_auto_add_extern(defs)
-- print defs
-+ print(defs)
- print("All Tests pass")
-Index: ecflow-4.6.1/Pyext/samples/api/sms2ecf.py
-===================================================================
---- ecflow-4.6.1.orig/Pyext/samples/api/sms2ecf.py
-+++ ecflow-4.6.1/Pyext/samples/api/sms2ecf.py
+--- ecflow-4.7.0.orig/Pyext/samples/api/sms2ecf.py
++++ ecflow-4.7.0/Pyext/samples/api/sms2ecf.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
""" one module to store needed function to translate SMS-ECFLOW suites """
@@ -304,10 +293,10 @@ Index: ecflow-4.6.1/Pyext/samples/api/sms2ecf.py
def load(name, host="localhost", port=31415):
import ecflow as ec
-Index: ecflow-4.6.1/Pyext/samples/api/ecf.py
+Index: ecflow-4.7.0/Pyext/samples/api/ecf.py
===================================================================
---- ecflow-4.6.1.orig/Pyext/samples/api/ecf.py
-+++ ecflow-4.6.1/Pyext/samples/api/ecf.py
+--- ecflow-4.7.0.orig/Pyext/samples/api/ecf.py
++++ ecflow-4.7.0/Pyext/samples/api/ecf.py
@@ -7,13 +7,14 @@ variables overwrite
"""
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index cf617e6..a35dbfb 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -3,10 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2017-07-11
Forwarded: no
-Index: ecflow-4.6.1/ACore/src/Version.cpp
+Index: ecflow-4.7.0/ACore/src/Version.cpp
===================================================================
---- ecflow-4.6.1.orig/ACore/src/Version.cpp
-+++ ecflow-4.6.1/ACore/src/Version.cpp
+--- ecflow-4.7.0.orig/ACore/src/Version.cpp
++++ ecflow-4.7.0/ACore/src/Version.cpp
@@ -85,7 +85,7 @@ std::string Version::description()
ss << " openssl";
#endif
diff --git a/debian/patches/set-paths.patch b/debian/patches/set-paths.patch
index 78ab50a..07c5361 100644
--- a/debian/patches/set-paths.patch
+++ b/debian/patches/set-paths.patch
@@ -3,10 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2017-07-17
Forwarded: not-needed
-Index: ecflow-4.6.1/tools/ecflow_logsvr.sh
+Index: ecflow-4.7.0/tools/ecflow_logsvr.sh
===================================================================
---- ecflow-4.6.1.orig/tools/ecflow_logsvr.sh
-+++ ecflow-4.6.1/tools/ecflow_logsvr.sh
+--- ecflow-4.7.0.orig/tools/ecflow_logsvr.sh
++++ ecflow-4.7.0/tools/ecflow_logsvr.sh
@@ -30,6 +30,13 @@ else
log=/sms/logsvr.log
fi
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
index 365a4e8..d550fb9 100644
--- a/debian/patches/soname.patch
+++ b/debian/patches/soname.patch
@@ -1,11 +1,11 @@
Description: Add a version number and name to package
-Index: ecflow-4.6.1/view/CMakeLists.txt
+Index: ecflow-4.7.0/view/CMakeLists.txt
===================================================================
---- ecflow-4.6.1.orig/view/CMakeLists.txt
-+++ ecflow-4.6.1/view/CMakeLists.txt
-@@ -207,7 +207,9 @@ ecbuild_add_library(TARGET ecflow_vie
+--- ecflow-4.7.0.orig/view/CMakeLists.txt
++++ ecflow-4.7.0/view/CMakeLists.txt
+@@ -206,7 +206,9 @@ ecbuild_add_library(TARGET ecflow_vie
CONDITION
MOTIF_FOUND AND X11_FOUND AND CMAKE_THREAD_LIBS_INIT
SOURCES
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ecflow.git
More information about the debian-science-commits
mailing list