The following commit has been merged in the master branch:
commit 9fe3035e57909640a3ef87f42ac463654bb8fdf8
Author: Andreas Tille <[email protected]>
Date: Mon Mar 5 10:52:46 2012 +0100
Reverted changes done by quilt in upstream files in Git repository
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b1adcf..46fb525 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,11 +151,9 @@ set(Boost_USE_MULTITHREAD ON)
find_package(Boost COMPONENTS thread REQUIRED)
find_package(Boost COMPONENTS program_options REQUIRED)
-find_package(Boost COMPONENTS system REQUIRED)
message(STATUS "Boost_INCLUDE_DIR : ${Boost_INCLUDE_DIR}")
message(STATUS "Boost_THREAD_LIBRARY : ${Boost_THREAD_LIBRARY}")
message(STATUS "Boost_PROGRAM_OPTIONS_LIBRARY :
${Boost_PROGRAM_OPTIONS_LIBRARY}")
-message(STATUS "Boost_SYSTEM_LIBRARY : ${Boost_SYSTEM_LIBRARY}")
# Boost version 1.39 or greater required
# Lower versions fail to compile with g++ 4.4
diff --git a/src/spcore/commoncomponents.h b/src/spcore/commoncomponents.h
index 1c97f73..91c40f7 100644
--- a/src/spcore/commoncomponents.h
+++ b/src/spcore/commoncomponents.h
@@ -71,7 +71,7 @@ public:
if (i>= argc) throw std::runtime_error("Missing
value for parameter -o");
if (!StrToInt(argv[i], &output_count) ||
output_count< 1 || output_count> 100)
- throw std::runtime_error("children
component: invalid value for parameter -o");
+ throw std::runtime_error("childs
component: invalid value for parameter -o");
}
}
--
Free software framework for ludic-therapeutic activities
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
