[med-svn] [SCM] Free software framework for ludic-therapeutic activities branch, master, updated. upstream/1.0.1-18-g9fe3035

[Andreas Tille]

The following commit has been merged in the master branch:
commit a458dfa1bfd61a10d5823008bc94639b83dc36d8
Author: Andreas Tille <tille at debian.org>
Date:   Mon Mar 5 10:51:17 2012 +0100

    Refreshed and updated patches to new upstream source

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46fb525..8b1adcf 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,9 +151,11 @@ 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/debian/changelog b/debian/changelog
index f1dc109..dc1dde0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ sitplus (1.0.3-1) unstable; urgency=low
   * New upstream version
     - debian/patches/lib_location_fix.diff: Removed because applied upstream 
     - debian/patches/packager.diff: Removed because applied upstream
+    - debian/patches/as-needed.patch: Partly applied upstream / refreshed 
 
- -- Andreas Tille <tille at debian.org>  Mon, 05 Mar 2012 10:45:22 +0100
+ -- Andreas Tille <tille at debian.org>  Mon, 05 Mar 2012 10:50:50 +0100
 
 sitplus (1.0.1-4) unstable; urgency=low
 
diff --git a/debian/patches/as-needed.patch b/debian/patches/as-needed.patch
index 2f43332..1756728 100644
--- a/debian/patches/as-needed.patch
+++ b/debian/patches/as-needed.patch
@@ -2,19 +2,9 @@ Description: fix underlinked library libsphost.a
  This allows building with --as-needed linker option.
 Author: Ilya Barygin <randomaction at ubuntu.com>
 
---- sitplus-1.0.1.orig/src/sphost/CMakeLists.txt
-+++ sitplus-1.0.1/src/sphost/CMakeLists.txt
-@@ -22,6 +22,7 @@
- target_link_libraries(sphost widgets_base)
- target_link_libraries(sphost ${Boost_FILESYSTEM_LIBRARY})
- target_link_libraries(sphost ${Boost_THREAD_LIBRARY})
-+target_link_libraries(sphost ${Boost_SYSTEM_LIBRARY})
- 
- if (ENABLE_NLS)
- 	target_link_libraries(sphost ${LIBINTL_LIBRARIES})
---- sitplus-1.0.1.orig/CMakeLists.txt
-+++ sitplus-1.0.1/CMakeLists.txt
-@@ -129,9 +129,11 @@ set(Boost_USE_MULTITHREAD ON)
+--- sitplus.orig/CMakeLists.txt
++++ sitplus/CMakeLists.txt
+@@ -151,9 +151,11 @@
  
  find_package(Boost COMPONENTS thread REQUIRED)
  find_package(Boost COMPONENTS program_options REQUIRED)
diff --git a/debian/patches/spelling.diff b/debian/patches/spelling.diff
index d0dd3d9..93f6e50 100644
--- a/debian/patches/spelling.diff
+++ b/debian/patches/spelling.diff
@@ -4,11 +4,9 @@ Description: This patch fixes a spelling error in source code
 * sitplus/src/spcore/commoncomponents.h: Changed error message "childs component" to "children component"
 
 Forwarded: no
-Index: sitplus/src/spcore/commoncomponents.h
-===================================================================
---- sitplus.orig/src/spcore/commoncomponents.h	2011-08-17 18:14:19.000000000 +0200
-+++ sitplus/src/spcore/commoncomponents.h	2011-08-17 18:15:20.000000000 +0200
-@@ -69,7 +69,7 @@
+--- sitplus.orig/src/spcore/commoncomponents.h
++++ sitplus/src/spcore/commoncomponents.h
+@@ -71,7 +71,7 @@
  				if (i>= argc) throw std::runtime_error("Missing value for parameter -o");
  
  				if (!StrToInt(argv[i], &output_count) || output_count< 1 || output_count> 100)
diff --git a/src/spcore/commoncomponents.h b/src/spcore/commoncomponents.h
index 91c40f7..1c97f73 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("childs component: invalid value for parameter -o");
+					throw std::runtime_error("children component: invalid value for parameter -o");
 			}
 		}
 

-- 
Free software framework for ludic-therapeutic activities