From 4b86e5e52e0a6d3c9cafcf9d9fa7757aa8726da2 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Mon, 20 Apr 2020 10:31:19 +0200
Subject: [PATCH 1/2] xtpcpp (0.3.7-3) buster
---
CMakeLists.txt | 2 +-
debian/changelog | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37247e29..321e4234 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,7 @@ else ()
endif ()
#depending on libpappsomspp version :
-SET(LIBPAPPSOMSPP_VERSION "0.7.2-3")
+SET(LIBPAPPSOMSPP_VERSION "0.7.3-2")
configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control @ONLY)
diff --git a/debian/changelog b/debian/changelog
index 65a8ae15..48652df1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xtpcpp (0.3.7-3) buster; urgency=medium
+
+ * no console in windows version
+ * pseudo centroid for tandem wrapper
+
+ -- Olivier Langella <olivier.langella@u-psud.fr> Mon, 20 Apr 2020 08:31:29 +0200
+
xtpcpp (0.3.7-2) buster; urgency=medium
* important fix in lib PAPPSOms++
--
GitLab
From c8d3e9ad29e175877a485c69bf6b3815578d110c Mon Sep 17 00:00:00 2001
From: Thomas Renne <thomas.renne@u-psud.fr>
Date: Fri, 24 Apr 2020 15:34:56 +0200
Subject: [PATCH 2/2] Correct Condor not running error
---
src/core/tandem_run/tandemcondorprocess.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/core/tandem_run/tandemcondorprocess.cpp b/src/core/tandem_run/tandemcondorprocess.cpp
index 0bbf77b7..b8fb2562 100644
--- a/src/core/tandem_run/tandemcondorprocess.cpp
+++ b/src/core/tandem_run/tandemcondorprocess.cpp
@@ -247,7 +247,7 @@ TandemCondorProcess::run()
else
{
QSettings settings;
- QString tandemwrapper_path =
+ QString tandemwrapper_path =
settings
.value("timstof/tandemwrapper_path", "/usr/bin/tandemwrapper")
.toString();
@@ -259,11 +259,11 @@ TandemCondorProcess::run()
*p_out
<< "Arguments = "
<< QFileInfo(p_xml_input_file->fileName()).absoluteFilePath()
- << " -t "
+ << " --tmp "
<< settings.value("timstof/tmp_dir_path", QDir::tempPath())
.toString()
- << "--tandem" << _tandem_run_batch._tandem_bin_path
- << "--centroid" << centroidOption << endl;
+ << " --tandem " << _tandem_run_batch._tandem_bin_path
+ << " --centroid " << centroidOption << endl;
}
*p_out << "Queue" << endl;
}
--
GitLab