[med-svn] [seaview] 01/02: Do not require user input at stdin when calling phyml

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository seaview.

commit a1c1bd597c7d2c215bee82d21987c0927fec3844
Author: Andreas Tille <tille at debian.org>
Date:   Wed Apr 20 12:01:35 2016 +0200

    Do not require user input at stdin when calling phyml
---
 debian/changelog                    | 11 +++++++++--
 debian/patches/no-interactive.patch | 14 ++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a45c908..2646026 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-seaview (1:4.6-1) UNRELEASED; urgency=medium
+seaview (1:4.6-2) UNRELEASED; urgency=medium
+
+  * Do not require user input at stdin when calling phyml
+
+ -- Andreas Tille <tille at debian.org>  Wed, 20 Apr 2016 11:26:31 +0200
+
+seaview (1:4.6-1) unstable; urgency=medium
 
   * New upstream version
   * Move packaging from SVN to Git
+  * Better hardening
 
- -- Andreas Tille <tille at debian.org>  Sat, 19 Mar 2016 23:51:50 +0100
+ -- Andreas Tille <tille at debian.org>  Sun, 20 Mar 2016 07:12:09 +0100
 
 seaview (1:4.5.4.8-2) unstable; urgency=medium
 
diff --git a/debian/patches/no-interactive.patch b/debian/patches/no-interactive.patch
new file mode 100644
index 0000000..cfd7742
--- /dev/null
+++ b/debian/patches/no-interactive.patch
@@ -0,0 +1,14 @@
+Description: Do not require user input at stdin when calling phyml
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 20 Apr 2016 11:26:31 +0200
+
+--- a/trees.cxx
++++ b/trees.cxx
+@@ -1123,6 +1123,7 @@ void run_phyml_callback(Fl_Widget *ob, v
+   else if(nni_spr_b->value()) strcat(args, " -s BEST");
+   if(!u_optimize->value()) { strcat(args, " -o lr"); user_tree = TRUE; }
+   if (u_quiet->value()) strcat(args, " --quiet");
++  else                  strcat(args, " --no_memory_check");
+   if(u_menutree->value()) {
+ 	   char *tree = view->trees[u_choice->value()];
+ 	   if(*tree == '[' && (p = strchr(tree, ']')) != NULL) { //remove tree header
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..644187b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-interactive.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/seaview.git