Commit 8b899ed4 authored by Gregory Sharp's avatar Gregory Sharp
Browse files

Update plastimatch for new upstream version

parent ca788dda
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
plastimatch (1.8.0+dfsg.1-1) unstable; urgency=medium

  * New upstream release
  * Remove man pages for fdk, drr, and landmark_warp; the functions of
    these programs have been merged into the main plastimatch executable
  * Remove obsolete CMake option
  * Remove obsolete patch

 -- Gregory C. Sharp <gregsharp.geo@yahoo.com>  Tue, 30 Apr 2019 16:59:46 -0400

plastimatch (1.7.4+dfsg.1-2) unstable; urgency=medium

  [ Gregory C. Sharp ]
+0 −3
Original line number Diff line number Diff line
doc/man/drr.1
doc/man/fdk.1
doc/man/landmark_warp.1
doc/man/plastimatch.1
+0 −38
Original line number Diff line number Diff line
From a4ceda25dcb7f732e3429de9a3f5e0962346454e Mon Sep 17 00:00:00 2001
From: "Gregory C. Sharp" <gregsharp.geo@yahoo.com>
Date: Thu, 17 Jan 2019 13:58:35 -0500
Subject: [PATCH] Make xf-invert-vrs-b-check regression test pass on 32-bit
 linux

---
 Testing/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 1c9f0b68..d2722107 100755
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -4500,16 +4500,16 @@ plm_add_test (
   ${PLM_PLASTIMATCH_PATH}/plastimatch
   "xf-invert;--input;${PLM_TESTING_DATA_DIR}/itk-rigid-b.tfm;--output;${PLM_BUILD_TESTING_DIR}/xf-invert-vrs-b.tfm"
   )
-plmtest_check_string (
+plmtest_check_interval (
   "xf-invert-vrs-b-check"
   "${PLM_BUILD_TESTING_DIR}/xf-invert-vrs-b.tfm"
-  "^Parameters: *(.*)$"
-  "-0.5236 0 0 0 0 0"
+  "^Parameters: *([-0-9.]*) *0 *0 *0 *0 *0 *$"
+  "-0.52361"
+  "-0.52359"
   )
 set_tests_properties (xf-invert-vrs-b-check
   PROPERTIES DEPENDS xf-invert-vrs-b)
 
-
 ## -------------------------------------------------------------------------
 ## bragg-curve
 ## proton-dose-1    Flavor a, sobp
-- 
2.11.0

debian/patches/series

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line
0001-Make-xf-invert-vrs-b-check-regression-test-pass-on-3.patch
+0 −2
Original line number Diff line number Diff line
@@ -20,9 +20,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
	dh $@

# CMAKE_PREFIX_PATH is used when building against ITK 3.20
DEB_CMAKE_EXTRA_FLAGS += \
	-DCMAKE_PREFIX_PATH=/usr/lib/InsightToolkit \
        -DCMAKE_BUILD_TYPE:STRING=RELEASE \
        -DCMAKE_SKIP_RPATH:BOOL=ON \
        -DPLM_CONFIG_DEBIAN_BUILD:BOOL=ON \