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

Luis Rivas Vañó luinix at gmail.com
Mon Mar 5 16:40:49 UTC 2012


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

    Fixing patches...

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/debian/patches/as-needed.patch b/debian/patches/as-needed.patch
new file mode 100644
index 0000000..2e6f46f
--- /dev/null
+++ b/debian/patches/as-needed.patch
@@ -0,0 +1,42 @@
+Description: Upstream changes introduced in version 1.0.3-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ sitplus (1.0.3-1) unstable; urgency=low
+ .
+   * New upstream version.
+   * Removed "lib_location_fix.diff" patch, no longer needed.
+   * Removed "packager.diff" patch, no longer needed.
+   * Removed "as-needed.patch" patch, no longer needed.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Luis Rivas Vañó <luinix at gmail.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- sitplus-1.0.3.orig/CMakeLists.txt
++++ sitplus-1.0.3/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/patches/series b/debian/patches/series
index f67a095..df5d5e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 spelling.diff
 libconfig_workaround.patch
+as-needed.patch

-- 
Free software framework for ludic-therapeutic activities



More information about the debian-med-commit mailing list