[med-svn] [camp] 06/07: Update and refresh patches. Remove useless patch for unit-tests.
Flavien Bridault
fbridault-guest at moszumanska.debian.org
Thu Sep 14 11:38:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
fbridault-guest pushed a commit to branch master
in repository camp.
commit e84ecb5f4fb82f2514ecfaa466f1c51f4f3c18d7
Author: Flavien Bridault <fbridault at ircad.fr>
Date: Thu Sep 14 11:10:54 2017 +0000
Update and refresh patches. Remove useless patch for unit-tests.
Unit-tests are already enabled by default.
---
debian/patches/fix_unit_tests_execution.patch | 21 ------
debian/patches/hide_boost_from_qt4moc.patch | 100 +++++++++++++-------------
debian/patches/remove_licences_files.patch | 11 +--
debian/patches/series | 1 -
4 files changed, 56 insertions(+), 77 deletions(-)
diff --git a/debian/patches/fix_unit_tests_execution.patch b/debian/patches/fix_unit_tests_execution.patch
deleted file mode 100644
index 1a34d6f..0000000
--- a/debian/patches/fix_unit_tests_execution.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Allows build and execution of the unit tests
-Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
---- camp.orig/CMakeLists.txt
-+++ camp/CMakeLists.txt
-@@ -169,11 +169,16 @@
- endif()
- endif()
-
-+enable_testing()
-+
- # add the test subdirectory, but do not build it by default
- if(BUILD_TEST)
- add_subdirectory(test)
- endif()
-
-+add_test(NAME test-camp COMMAND camptest)
-+add_test(NAME test-camp-qt COMMAND camptest-qt)
-+
- ###############################
- # doc
- ###############################
diff --git a/debian/patches/hide_boost_from_qt4moc.patch b/debian/patches/hide_boost_from_qt4moc.patch
index 2fca873..ee623d2 100644
--- a/debian/patches/hide_boost_from_qt4moc.patch
+++ b/debian/patches/hide_boost_from_qt4moc.patch
@@ -4,7 +4,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/arraymapper.hpp
+++ camp/include/camp/arraymapper.hpp
-@@ -27,7 +27,9 @@
+@@ -36,7 +36,9 @@
#include <camp/config.hpp>
#include <camp/detail/yesnotype.hpp>
@@ -16,7 +16,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/detail/functionimpl.hpp
+++ camp/include/camp/detail/functionimpl.hpp
-@@ -29,9 +29,11 @@
+@@ -38,9 +38,11 @@
#include <camp/value.hpp>
#include <camp/errors.hpp>
#include <camp/detail/callhelper.hpp>
@@ -30,7 +30,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/detail/functiontraits.hpp
+++ camp/include/camp/detail/functiontraits.hpp
-@@ -26,9 +26,11 @@
+@@ -35,9 +35,11 @@
#include <camp/detail/yesnotype.hpp>
@@ -44,7 +44,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace camp
--- camp.orig/include/camp/detail/getter.hpp
+++ camp/include/camp/detail/getter.hpp
-@@ -26,8 +26,10 @@
+@@ -35,8 +35,10 @@
#include <camp/userobject.hpp>
@@ -57,7 +57,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace camp
--- camp.orig/include/camp/detail/issmartpointer.hpp
+++ camp/include/camp/detail/issmartpointer.hpp
-@@ -26,7 +26,9 @@
+@@ -35,7 +35,9 @@
#include <camp/detail/yesnotype.hpp>
@@ -69,7 +69,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace camp
--- camp.orig/include/camp/detail/objecttraits.hpp
+++ camp/include/camp/detail/objecttraits.hpp
-@@ -27,9 +27,11 @@
+@@ -36,9 +36,11 @@
#include <camp/detail/rawtype.hpp>
#include <camp/detail/issmartpointer.hpp>
@@ -83,7 +83,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace camp
--- camp.orig/include/camp/detail/propertyfactory.hpp
+++ camp/include/camp/detail/propertyfactory.hpp
-@@ -31,10 +31,12 @@
+@@ -40,10 +40,12 @@
#include <camp/detail/enumpropertyimpl.hpp>
#include <camp/detail/userpropertyimpl.hpp>
#include <camp/detail/functiontraits.hpp>
@@ -98,7 +98,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace camp
--- camp.orig/include/camp/detail/typeid.hpp
+++ camp/include/camp/detail/typeid.hpp
-@@ -27,7 +27,9 @@
+@@ -36,7 +36,9 @@
#include <camp/detail/objecttraits.hpp>
#include <camp/detail/yesnotype.hpp>
@@ -110,7 +110,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace camp
--- camp.orig/include/camp/detail/valueimpl.hpp
+++ camp/include/camp/detail/valueimpl.hpp
-@@ -27,7 +27,9 @@
+@@ -36,7 +36,9 @@
#include <camp/type.hpp>
#include <camp/valuemapper.hpp>
#include <camp/errors.hpp>
@@ -122,7 +122,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace camp
--- camp.orig/include/camp/enumbuilder.hpp
+++ camp/include/camp/enumbuilder.hpp
-@@ -26,7 +26,9 @@
+@@ -35,7 +35,9 @@
#include <camp/config.hpp>
@@ -134,7 +134,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/enumobject.hpp
+++ camp/include/camp/enumobject.hpp
-@@ -27,9 +27,11 @@
+@@ -36,9 +36,11 @@
#include <camp/config.hpp>
#include <camp/enumget.hpp>
@@ -148,7 +148,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/error.hpp
+++ camp/include/camp/error.hpp
-@@ -26,8 +26,10 @@
+@@ -35,8 +35,10 @@
#include <camp/config.hpp>
@@ -161,7 +161,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/tagholder.hpp
+++ camp/include/camp/tagholder.hpp
-@@ -28,7 +28,9 @@
+@@ -37,7 +37,9 @@
#include <camp/config.hpp>
#include <camp/detail/getter.hpp>
#include <camp/value.hpp>
@@ -173,7 +173,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/userobject.hpp
+++ camp/include/camp/userobject.hpp
-@@ -30,10 +30,12 @@
+@@ -39,10 +39,12 @@
#include <camp/errors.hpp>
#include <camp/detail/objecttraits.hpp>
#include <camp/detail/objectholder.hpp>
@@ -188,7 +188,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/value.hpp
+++ camp/include/camp/value.hpp
-@@ -31,7 +31,9 @@
+@@ -40,7 +40,9 @@
#include <camp/userobject.hpp>
#include <camp/valuemapper.hpp>
#include <camp/detail/valueimpl.hpp>
@@ -200,7 +200,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/valuemapper.hpp
+++ camp/include/camp/valuemapper.hpp
-@@ -30,9 +30,11 @@
+@@ -39,9 +39,11 @@
#include <camp/userobject.hpp>
#include <camp/arraymapper.hpp>
#include <camp/errors.hpp>
@@ -214,7 +214,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace camp_ext
--- camp.orig/include/camp/valuevisitor.hpp
+++ camp/include/camp/valuevisitor.hpp
-@@ -25,7 +25,9 @@
+@@ -34,7 +34,9 @@
#define CAMP_VALUEVISITOR_HPP
@@ -226,7 +226,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace camp
--- camp.orig/test/arrayproperty.cpp
+++ camp/test/arrayproperty.cpp
-@@ -24,7 +24,9 @@
+@@ -31,7 +31,9 @@
#include <camp/classget.hpp>
#include <camp/errors.hpp>
#include <camp/arrayproperty.hpp>
@@ -238,7 +238,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/arrayproperty.hpp
+++ camp/test/arrayproperty.hpp
-@@ -25,7 +25,9 @@
+@@ -32,7 +32,9 @@
#include <camp/camptype.hpp>
#include <camp/class.hpp>
@@ -250,7 +250,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/class.cpp
+++ camp/test/class.cpp
-@@ -23,7 +23,9 @@
+@@ -30,7 +30,9 @@
#include "class.hpp"
#include <camp/classget.hpp>
#include <camp/errors.hpp>
@@ -262,7 +262,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/classvisitor.cpp
+++ camp/test/classvisitor.cpp
-@@ -22,7 +22,9 @@
+@@ -29,7 +29,9 @@
#include "classvisitor.hpp"
#include <camp/classget.hpp>
@@ -274,7 +274,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/constructor.cpp
+++ camp/test/constructor.cpp
-@@ -23,7 +23,9 @@
+@@ -30,7 +30,9 @@
#include "constructor.hpp"
#include <camp/classget.hpp>
#include <camp/errors.hpp>
@@ -286,7 +286,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/enum.cpp
+++ camp/test/enum.cpp
-@@ -23,7 +23,9 @@
+@@ -30,7 +30,9 @@
#include "enum.hpp"
#include <camp/enumget.hpp>
#include <camp/errors.hpp>
@@ -298,7 +298,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/enumobject.cpp
+++ camp/test/enumobject.cpp
-@@ -24,7 +24,9 @@
+@@ -31,7 +31,9 @@
#include <camp/enumget.hpp>
#include <camp/enumobject.hpp>
#include <camp/errors.hpp>
@@ -310,7 +310,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/enumproperty.cpp
+++ camp/test/enumproperty.cpp
-@@ -25,7 +25,9 @@
+@@ -32,7 +32,9 @@
#include <camp/enumget.hpp>
#include <camp/errors.hpp>
#include <camp/enumproperty.hpp>
@@ -322,7 +322,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/enumproperty.hpp
+++ camp/test/enumproperty.hpp
-@@ -26,7 +26,9 @@
+@@ -33,7 +33,9 @@
#include <camp/camptype.hpp>
#include <camp/enum.hpp>
#include <camp/class.hpp>
@@ -334,7 +334,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/function.cpp
+++ camp/test/function.cpp
-@@ -25,7 +25,9 @@
+@@ -32,7 +32,9 @@
#include <camp/enumget.hpp>
#include <camp/function.hpp>
#include <camp/errors.hpp>
@@ -346,7 +346,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/functionaccess.cpp
+++ camp/test/functionaccess.cpp
-@@ -24,7 +24,9 @@
+@@ -31,7 +31,9 @@
#include <camp/classget.hpp>
#include <camp/function.hpp>
#include <camp/errors.hpp>
@@ -358,7 +358,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/inheritance.cpp
+++ camp/test/inheritance.cpp
-@@ -24,7 +24,9 @@
+@@ -31,7 +31,9 @@
#include <camp/class.hpp>
#include <camp/classget.hpp>
#include <camp/errors.hpp>
@@ -370,7 +370,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/main.cpp
+++ camp/test/main.cpp
-@@ -27,4 +27,6 @@
+@@ -34,4 +34,6 @@
// so that we don't need to link to it as an external library.
// Note: to disable that and link to boost.test as a library,
// simply remove "/included" from the header path below.
@@ -379,7 +379,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
+#endif
--- camp.orig/test/mapper.cpp
+++ camp/test/mapper.cpp
-@@ -22,7 +22,9 @@
+@@ -29,7 +29,9 @@
#include "mapper.hpp"
#include <camp/classget.hpp>
@@ -391,7 +391,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/property.cpp
+++ camp/test/property.cpp
-@@ -25,7 +25,9 @@
+@@ -32,7 +32,9 @@
#include <camp/enumget.hpp>
#include <camp/property.hpp>
#include <camp/errors.hpp>
@@ -403,7 +403,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/property.hpp
+++ camp/test/property.hpp
-@@ -26,7 +26,9 @@
+@@ -33,7 +33,9 @@
#include <camp/camptype.hpp>
#include <camp/class.hpp>
#include <camp/enum.hpp>
@@ -415,7 +415,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace PropertyTest
--- camp.orig/test/propertyaccess.cpp
+++ camp/test/propertyaccess.cpp
-@@ -24,7 +24,9 @@
+@@ -31,7 +31,9 @@
#include <camp/classget.hpp>
#include <camp/property.hpp>
#include <camp/errors.hpp>
@@ -427,8 +427,8 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/qt/functionmapping.cpp
+++ camp/test/qt/functionmapping.cpp
-@@ -23,7 +23,9 @@
- #include "functionmapping.hpp"
+@@ -31,7 +31,9 @@
+ #include "logger.hpp"
#include <camp/class.hpp>
#include <camp/classget.hpp>
+#ifndef Q_MOC_RUN
@@ -439,7 +439,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/qt/main.cpp
+++ camp/test/qt/main.cpp
-@@ -27,4 +27,6 @@
+@@ -34,4 +34,6 @@
// so that we don't need to link to it as an external library.
// Note: to disable that and link to boost.test as a library,
// simply remove "/included" from the header path below.
@@ -448,7 +448,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
+#endif
--- camp.orig/test/qt/propertymapping.cpp
+++ camp/test/qt/propertymapping.cpp
-@@ -23,7 +23,9 @@
+@@ -30,7 +30,9 @@
#include "propertymapping.hpp"
#include <camp/class.hpp>
#include <camp/classget.hpp>
@@ -460,7 +460,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/qt/qstringmapping.cpp
+++ camp/test/qt/qstringmapping.cpp
-@@ -22,7 +22,9 @@
+@@ -29,7 +29,9 @@
#include <camp/value.hpp>
#include <camp/qt/qt.hpp>
@@ -472,7 +472,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
// To make the boost.test logger happy
--- camp.orig/test/tagholder.cpp
+++ camp/test/tagholder.cpp
-@@ -23,7 +23,9 @@
+@@ -30,7 +30,9 @@
#include "tagholder.hpp"
#include <camp/classget.hpp>
#include <camp/errors.hpp>
@@ -484,7 +484,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/userobject.cpp
+++ camp/test/userobject.cpp
-@@ -24,7 +24,9 @@
+@@ -31,7 +31,9 @@
#include <camp/classget.hpp>
#include <camp/errors.hpp>
#include <camp/userobject.hpp>
@@ -496,7 +496,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/userobject.hpp
+++ camp/test/userobject.hpp
-@@ -25,7 +25,9 @@
+@@ -32,7 +32,9 @@
#include <camp/camptype.hpp>
#include <camp/class.hpp>
@@ -508,7 +508,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace UserObjectTest
--- camp.orig/test/userproperty.cpp
+++ camp/test/userproperty.cpp
-@@ -23,7 +23,9 @@
+@@ -30,7 +30,9 @@
#include "userproperty.hpp"
#include <camp/classget.hpp>
#include <camp/userproperty.hpp>
@@ -520,7 +520,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/test/value.cpp
+++ camp/test/value.cpp
-@@ -23,7 +23,9 @@
+@@ -30,7 +30,9 @@
#include "value.hpp"
#include <camp/value.hpp>
#include <camp/errors.hpp>
@@ -532,7 +532,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/class.hpp
+++ camp/include/camp/class.hpp
-@@ -36,12 +36,14 @@
+@@ -45,12 +45,14 @@
#include <camp/userobject.hpp>
#include <camp/detail/classmanager.hpp>
#include <camp/detail/typeid.hpp>
@@ -549,7 +549,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/classbuilder.hpp
+++ camp/include/camp/classbuilder.hpp
-@@ -31,9 +31,11 @@
+@@ -40,9 +40,11 @@
#include <camp/detail/functiontraits.hpp>
#include <camp/detail/constructorimpl.hpp>
#include <camp/detail/propertyfactory.hpp>
@@ -563,7 +563,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/detail/arraypropertyimpl.hpp
+++ camp/include/camp/detail/arraypropertyimpl.hpp
-@@ -28,7 +28,9 @@
+@@ -37,7 +37,9 @@
#include <camp/arrayproperty.hpp>
#include <camp/arraymapper.hpp>
#include <camp/detail/valueprovider.hpp>
@@ -575,7 +575,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
namespace camp
--- camp.orig/include/camp/enum.hpp
+++ camp/include/camp/enum.hpp
-@@ -30,11 +30,13 @@
+@@ -39,11 +39,13 @@
#include <camp/enumget.hpp>
#include <camp/detail/enummanager.hpp>
#include <camp/detail/typeid.hpp>
@@ -591,7 +591,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/detail/enummanager.hpp
+++ camp/include/camp/detail/enummanager.hpp
-@@ -27,11 +27,13 @@
+@@ -36,11 +36,13 @@
#include <camp/config.hpp>
#include <camp/detail/observernotifier.hpp>
@@ -607,7 +607,7 @@ Author: Robert Bruce Park <robert.park at canonical.com>
--- camp.orig/include/camp/detail/classmanager.hpp
+++ camp/include/camp/detail/classmanager.hpp
-@@ -27,12 +27,14 @@
+@@ -36,12 +36,14 @@
#include <camp/config.hpp>
#include <camp/detail/observernotifier.hpp>
diff --git a/debian/patches/remove_licences_files.patch b/debian/patches/remove_licences_files.patch
index bacce59..457b1b1 100644
--- a/debian/patches/remove_licences_files.patch
+++ b/debian/patches/remove_licences_files.patch
@@ -2,17 +2,18 @@ Description: Remove license files
Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
--- camp.orig/CMakeLists.txt
+++ camp/CMakeLists.txt
-@@ -200,8 +200,7 @@
- ARCHIVE DESTINATION lib COMPONENT devel
+@@ -247,8 +247,8 @@
+ COMPONENT devel
)
--install(FILES README.txt COPYING.txt LICENSE.LGPL3.txt
+-install(FILES README.txt COPYING.txt
- DESTINATION ${INSTALL_MISC_DIR}
-+install(FILES README.txt DESTINATION ${INSTALL_MISC_DIR}
++install(FILES README.txt
++ DESTINATION ${INSTALL_MISC_DIR}
)
install(DIRECTORY cmake
-@@ -213,5 +212,5 @@
+@@ -260,5 +260,5 @@
# packaging
###############################
diff --git a/debian/patches/series b/debian/patches/series
index bde7ebe..3aa04d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
remove_licences_files.patch
-fix_unit_tests_execution.patch
hide_boost_from_qt4moc.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/camp.git
More information about the debian-med-commit
mailing list