[med-svn] [camp] 01/01: Remove patches that were integrated upstream.

[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 93128c754e699d8d3c7d9a69652c6556e6563e82
Author: Flavien Bridault <fbridault at ircad.fr>
Date:   Thu Sep 14 10:35:16 2017 +0000

    Remove patches that were integrated upstream.
    
    Also, use CMake variables to enable testing instead of patching.
---
 debian/patches/add_soname.patch               | 13 -------------
 debian/patches/fix_unit_tests_execution.patch | 23 -----------------------
 debian/patches/rm_boost_version.patch         | 24 ------------------------
 debian/patches/series                         |  2 --
 debian/rules                                  |  3 +++
 5 files changed, 3 insertions(+), 62 deletions(-)

diff --git a/debian/patches/add_soname.patch b/debian/patches/add_soname.patch
deleted file mode 100644
index 3125f5e..0000000
--- a/debian/patches/add_soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Add version number
-Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
---- camp.orig/CMakeLists.txt
-+++ camp/CMakeLists.txt
-@@ -152,7 +152,7 @@
- 
- # define the export macro
- if(BUILD_SHARED_LIBS)
--    set_target_properties(camp PROPERTIES DEFINE_SYMBOL CAMP_EXPORTS)
-+    set_target_properties(camp PROPERTIES DEFINE_SYMBOL CAMP_EXPORTS SOVERSION 0.7 VERSION 0.7.1.5)
- else()
-     add_definitions(-DCAMP_STATIC)
- endif()
diff --git a/debian/patches/fix_unit_tests_execution.patch b/debian/patches/fix_unit_tests_execution.patch
index ae9d109..1a34d6f 100644
--- a/debian/patches/fix_unit_tests_execution.patch
+++ b/debian/patches/fix_unit_tests_execution.patch
@@ -1,28 +1,5 @@
 Description: Allows build and execution of the unit tests
 Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
---- camp.orig/cmake/Config.cmake
-+++ camp/cmake/Config.cmake
-@@ -20,16 +20,16 @@
-     )
- endif()
- 
--# Set the default test build option to false
-+# Set the default test build option to true
- if(NOT BUILD_TEST)
--    set(BUILD_TEST FALSE
-+    set(BUILD_TEST TRUE
-         CACHE BOOL "TRUE to build the unit tests (requires the Boost Test Library), FALSE otherwise."
-     )
- endif()
- 
--# Set the default test build option to false
-+# Set the default test build option to true
- if(NOT BUILD_TEST_QT)
--    set(BUILD_TEST_QT FALSE
-+    set(BUILD_TEST_QT TRUE
-         CACHE BOOL "TRUE to build the Qt-specific unit tests (requires the Boost Test Library and Qt 4.5), FALSE otherwise."
-     )
- endif()
 --- camp.orig/CMakeLists.txt
 +++ camp/CMakeLists.txt
 @@ -169,11 +169,16 @@
diff --git a/debian/patches/rm_boost_version.patch b/debian/patches/rm_boost_version.patch
deleted file mode 100644
index 21b1f5b..0000000
--- a/debian/patches/rm_boost_version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Delete boost version of CMakeLists.txt
-Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
---- camp.orig/CMakeLists.txt
-+++ camp/CMakeLists.txt
-@@ -135,7 +135,7 @@
- )
- 
- # find Boost
--find_package(Boost 1.38.0 REQUIRED)
-+find_package(Boost REQUIRED)
- 
- # include files search paths
- include_directories(
---- camp.orig/test/CMakeLists.txt
-+++ camp/test/CMakeLists.txt
-@@ -62,7 +62,7 @@
- )
- 
- # find Boost
--find_package(Boost 1.38.0)
-+find_package(Boost REQUIRED)
- 
- # include files search paths
- include_directories(
diff --git a/debian/patches/series b/debian/patches/series
index acf7eb8..bde7ebe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-add_soname.patch
-rm_boost_version.patch
 remove_licences_files.patch
 fix_unit_tests_execution.patch
 hide_boost_from_qt4moc.patch
diff --git a/debian/rules b/debian/rules
index 8906a9f..676c76a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DBUILD_TEST=TRUE -DBUILD_TEST_QT=TRUE
+
 override_dh_install:
 	dh_install
 	d-shlibmove \

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