[med-svn] [camp] 07/11: Removed support_c++11.patch and updated other patches to avoid fuzz.

[Flavien Bridault]

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

fbridault-guest pushed a commit to branch master
in repository camp.

commit b0d68c2607b338f310388ea6d8ccf99943edb943
Author: Flavien Bridault <fbridault at ircad.fr>
Date:   Wed Nov 16 12:03:52 2016 +0100

    Removed support_c++11.patch and updated other patches to avoid fuzz.
---
 debian/patches/add_soname.patch               |  6 +++---
 debian/patches/fix_unit_tests_execution.patch | 10 +++++-----
 debian/patches/remove_licences_files.patch    | 14 +++++++-------
 debian/patches/rm_boost_version.patch         | 10 +++++-----
 debian/patches/series                         |  1 -
 debian/patches/support_c++11.patch            | 15 ---------------
 6 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/debian/patches/add_soname.patch b/debian/patches/add_soname.patch
index f4c26cc..006fe47 100644
--- a/debian/patches/add_soname.patch
+++ b/debian/patches/add_soname.patch
@@ -1,8 +1,8 @@
 Description: Add version number
 Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -148,7 +148,7 @@
+--- camp.orig/CMakeLists.txt
++++ camp/CMakeLists.txt
+@@ -152,7 +152,7 @@
  
  # define the export macro
  if(BUILD_SHARED_LIBS)
diff --git a/debian/patches/fix_unit_tests_execution.patch b/debian/patches/fix_unit_tests_execution.patch
index 733d62a..ae9d109 100644
--- a/debian/patches/fix_unit_tests_execution.patch
+++ b/debian/patches/fix_unit_tests_execution.patch
@@ -1,7 +1,7 @@
 Description: Allows build and execution of the unit tests
 Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
---- a/cmake/Config.cmake
-+++ b/cmake/Config.cmake
+--- camp.orig/cmake/Config.cmake
++++ camp/cmake/Config.cmake
 @@ -20,16 +20,16 @@
      )
  endif()
@@ -23,9 +23,9 @@ Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
          CACHE BOOL "TRUE to build the Qt-specific unit tests (requires the Boost Test Library and Qt 4.5), FALSE otherwise."
      )
  endif()
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -165,11 +165,16 @@
+--- camp.orig/CMakeLists.txt
++++ camp/CMakeLists.txt
+@@ -169,11 +169,16 @@
      endif()
  endif()
  
diff --git a/debian/patches/remove_licences_files.patch b/debian/patches/remove_licences_files.patch
index ccd8b8f..0546983 100644
--- a/debian/patches/remove_licences_files.patch
+++ b/debian/patches/remove_licences_files.patch
@@ -1,6 +1,6 @@
 Description: Remove license files
 Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
---- a/LICENSE.GPL3.txt
+--- camp.orig/LICENSE.GPL3.txt
 +++ /dev/null
 @@ -1,674 +0,0 @@
 -                    GNU GENERAL PUBLIC LICENSE
@@ -677,7 +677,7 @@ Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
 -the library.  If this is what you want to do, use the GNU Lesser General
 -Public License instead of this License.  But first, please read
 -<http://www.gnu.org/philosophy/why-not-lgpl.html>.
---- a/LICENSE.LGPL3.txt
+--- camp.orig/LICENSE.LGPL3.txt
 +++ /dev/null
 @@ -1,165 +0,0 @@
 -                   GNU LESSER GENERAL PUBLIC LICENSE
@@ -845,9 +845,9 @@ Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
 -apply, that proxy's public statement of acceptance of any version is
 -permanent authorization for you to choose that version for the
 -Library.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -196,8 +196,7 @@
+--- camp.orig/CMakeLists.txt
++++ camp/CMakeLists.txt
+@@ -200,8 +200,7 @@
      ARCHIVE DESTINATION lib COMPONENT devel
  )
  
@@ -857,14 +857,14 @@ Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
  )
  
  install(DIRECTORY cmake
-@@ -209,5 +208,5 @@
+@@ -213,5 +212,5 @@
  # packaging
  ###############################
  
 -include(${CAMP_SOURCE_DIR}/cmake/Packaging.cmake OPTIONAL)
 +#include(${CAMP_SOURCE_DIR}/cmake/Packaging.cmake OPTIONAL)
  
---- a/COPYING.txt
+--- camp.orig/COPYING.txt
 +++ /dev/null
 @@ -1,18 +0,0 @@
 -Copyright (C) 2009-2010 TECHNOGERMA Systems France and/or its subsidiary(-ies).
diff --git a/debian/patches/rm_boost_version.patch b/debian/patches/rm_boost_version.patch
index b1c2f13..21b1f5b 100644
--- a/debian/patches/rm_boost_version.patch
+++ b/debian/patches/rm_boost_version.patch
@@ -1,8 +1,8 @@
 Description: Delete boost version of CMakeLists.txt
 Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -131,7 +131,7 @@
+--- camp.orig/CMakeLists.txt
++++ camp/CMakeLists.txt
+@@ -135,7 +135,7 @@
  )
  
  # find Boost
@@ -11,8 +11,8 @@ Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
  
  # include files search paths
  include_directories(
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
+--- camp.orig/test/CMakeLists.txt
++++ camp/test/CMakeLists.txt
 @@ -62,7 +62,7 @@
  )
  
diff --git a/debian/patches/series b/debian/patches/series
index 427b413..acf7eb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ rm_boost_version.patch
 remove_licences_files.patch
 fix_unit_tests_execution.patch
 hide_boost_from_qt4moc.patch
-support_c++11.patch
diff --git a/debian/patches/support_c++11.patch b/debian/patches/support_c++11.patch
deleted file mode 100644
index 74a12f0..0000000
--- a/debian/patches/support_c++11.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Add std=c++11 flag
-Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
-
---- camp-0.7.1.3.orig/CMakeLists.txt
-+++ camp-0.7.1.3/CMakeLists.txt
-@@ -30,6 +30,9 @@ project(CAMP)
- include(${CMAKE_SOURCE_DIR}/cmake/Config.cmake)
- include(${CMAKE_SOURCE_DIR}/cmake/PackageFilename.cmake)
- 
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11"
-+                 CACHE STRING "Flags used by the compiler during all build types." FORCE)
-+
- # all source files
- set(CAMP_SRCS
-     include/camp/userproperty.hpp

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