[med-svn] [plastimatch] 01/01: Fix gbp buildpackage errors

Greg Sharp gregsharp-guest at moszumanska.debian.org
Wed Oct 11 18:25:10 UTC 2017


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

gregsharp-guest pushed a commit to branch master
in repository plastimatch.

commit c68b88e59d5263894ccc9921bd04f56bda68875c
Author: Gregory C. Sharp <gregsharp.geo at yahoo.com>
Date:   Wed Oct 11 14:24:54 2017 -0400

    Fix gbp buildpackage errors
---
 .../patches/0001-Missing-lconv-in-CMakeLists.patch  | 21 +++++++++++++++++++++
 ...0002-Suppress-failing-proton-dose-testcase.patch | 14 ++++++++++++++
 debian/patches/series                               |  2 ++
 3 files changed, 37 insertions(+)

diff --git a/debian/patches/0001-Missing-lconv-in-CMakeLists.patch b/debian/patches/0001-Missing-lconv-in-CMakeLists.patch
new file mode 100644
index 0000000..fd42e82
--- /dev/null
+++ b/debian/patches/0001-Missing-lconv-in-CMakeLists.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d52f0a9..aa6d72b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -994,10 +994,12 @@ if (PLM_BUILD_TESTING)
+   add_subdirectory (Testing)
+ 
+   # Copy the lconv script
+-  configure_file (
+-    "${CMAKE_SOURCE_DIR}/extra/devtools/run_lcov.sh" 
+-    "${CMAKE_BINARY_DIR}/run_lcov.sh"
+-    COPYONLY)
++  if (EXISTS "${CMAKE_SOURCE_DIR}/extra/devtools/run_lcov.sh")
++    configure_file (
++      "${CMAKE_SOURCE_DIR}/extra/devtools/run_lcov.sh" 
++      "${CMAKE_BINARY_DIR}/run_lcov.sh"
++      COPYONLY)
++  endif ()
+ endif ()
+ 
+ ##-----------------------------------------------------------------------------
diff --git a/debian/patches/0002-Suppress-failing-proton-dose-testcase.patch b/debian/patches/0002-Suppress-failing-proton-dose-testcase.patch
new file mode 100644
index 0000000..daa3a66
--- /dev/null
+++ b/debian/patches/0002-Suppress-failing-proton-dose-testcase.patch
@@ -0,0 +1,14 @@
+diff --git a/Testing/CTestCustom.cmake.in b/Testing/CTestCustom.cmake.in
+index 651a375..28656d8 100644
+--- a/Testing/CTestCustom.cmake.in
++++ b/Testing/CTestCustom.cmake.in
+@@ -344,6 +344,9 @@ if (PLM_CONFIG_DEBIAN_BUILD)
+     "proton-dose-5a"
+     "proton-dose-5a-stats"
+     "proton-dose-5a-check"
++    "proton-dose-5d"
++    "proton-dose-5d-stats"
++    "proton-dose-5d-check"
+     "proton-dose-5g"
+     "proton-dose-5g-stats"
+     "proton-dose-5g-check"
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..46f1eda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Missing-lconv-in-CMakeLists.patch
+0002-Suppress-failing-proton-dose-testcase.patch

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



More information about the debian-med-commit mailing list