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

[Luis Rivas Vañó]

The following commit has been merged in the master branch:
commit 59ff3baec3b3e9289c3d9e800557098ea4015e5b
Author: Luis Rivas Vañó <luinix at gmail.com>
Date:   Mon Mar 5 13:19:35 2012 +0100

    Patch as-needed.patch no longer needed

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 2a72d62..1e34842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 sitplus (1.0.3-1) unstable; urgency=low
 
   * New upstream version.
-  * Removed "lib_location_fix.diff" patch, now unnecessary.
-  * Removed "packager.diff" patch, now unnecessary.
+  * Removed "lib_location_fix.diff" patch, no longer needed.
+  * Removed "packager.diff" patch, no longer needed.
+  * Removed "as-needed.patch" patch, no longer needed.
 
  -- Luis Rivas Vañó <luinix at gmail.com>  Mon, 05 Mar 2012 12:58:42 +0100
 
diff --git a/debian/patches/as-needed.patch b/debian/patches/as-needed.patch
deleted file mode 100644
index 2f43332..0000000
--- a/debian/patches/as-needed.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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)
- 
- 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/patches/series b/debian/patches/series
index abb8667..f67a095 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 spelling.diff
-as-needed.patch
 libconfig_workaround.patch

-- 
Free software framework for ludic-therapeutic activities