[med-svn] [opensurgsim] 02/03: Undo modified upstream source, CMakeLists.txt

[Paul Novotny]

This is an automated email from the git hooks/post-receive script.

paulnovo-guest pushed a commit to branch master
in repository opensurgsim.

commit 454836557ce0e72b4e64e4d2bb78105b7d07cbe2
Author: Paul Novotny <paul at paulnovo.us>
Date:   Sat Feb 21 20:55:11 2015 -0500

    Undo modified upstream source, CMakeLists.txt
    
    Undo changes to the upstream source and put it into a patch file.
    This patch is also combined with the yaml-flow.patch and renamed to
    use-debian-yaml-cpp.patch since both changes deal with using the
    Debian's version of yaml-cpp.
---
 CMakeLists.txt                                                |  2 +-
 debian/patches/series                                         |  2 +-
 debian/patches/{yaml-flow.patch => use-debian-yaml-cpp.patch} | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a99c9e..875d89d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,7 @@ endif()
 
 option(USE_SYSTEM_YAMLCPP "Should we use the system yaml-cpp?" OFF)
 if(USE_SYSTEM_YAMLCPP)
-	find_package(yaml-cpp 0.5.1 EXACT REQUIRED)
+	find_package(yaml-cpp 0.5.1.2 EXACT REQUIRED)
 else(USE_SYSTEM_YAMLCPP)
 	include(External_yamlcpp)
 endif(USE_SYSTEM_YAMLCPP)
diff --git a/debian/patches/series b/debian/patches/series
index dd2ebfb..125c344 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-yaml-flow.patch
 backport-03c10f32d.patch
+use-debian-yaml-cpp.patch
diff --git a/debian/patches/yaml-flow.patch b/debian/patches/use-debian-yaml-cpp.patch
similarity index 72%
rename from debian/patches/yaml-flow.patch
rename to debian/patches/use-debian-yaml-cpp.patch
index 6607c86..8a0f390 100644
--- a/debian/patches/yaml-flow.patch
+++ b/debian/patches/use-debian-yaml-cpp.patch
@@ -5,6 +5,17 @@ Description: Update yaml-cpp name for Flow Style
 Author: Paul Novotny <paul at paulnovo.us>
 Last-Update: 2015-02-21
 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,7 +87,7 @@
+ 
+ option(USE_SYSTEM_YAMLCPP "Should we use the system yaml-cpp?" OFF)
+ if(USE_SYSTEM_YAMLCPP)
+-	find_package(yaml-cpp 0.5.1.2 EXACT REQUIRED)
++	find_package(yaml-cpp 0.5.1 EXACT REQUIRED)
+ else(USE_SYSTEM_YAMLCPP)
+ 	include(External_yamlcpp)
+ endif(USE_SYSTEM_YAMLCPP)
 --- opensurgsim.orig/SurgSim/Math/MathConvert-inl.h
 +++ opensurgsim/SurgSim/Math/MathConvert-inl.h
 @@ -33,7 +33,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/opensurgsim.git