This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository otb.
commit b55b3ab7ce88bef75521b89dfa2d01f274c6c6ee Author: Bas Couwenberg <[email protected]> Date: Thu Jul 28 21:26:00 2016 +0200 Add patch to only use OTB_GIT_STATUS_MESSAGE in message function if set. --- debian/changelog | 1 + debian/patches/cmake-message.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 22 insertions(+) diff --git a/debian/changelog b/debian/changelog index c36682b..51ab9e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ otb (5.6.0+dfsg-1) UNRELEASED; urgency=medium - Add license & copyright for SPTW * Add python-numpy to build dependencies. * Override dh_python2 to call dh_numpy too. + * Add patch to only use OTB_GIT_STATUS_MESSAGE in message function if set. -- Bas Couwenberg <[email protected]> Thu, 28 Jul 2016 18:12:09 +0200 diff --git a/debian/patches/cmake-message.patch b/debian/patches/cmake-message.patch new file mode 100644 index 0000000..d67a7bf --- /dev/null +++ b/debian/patches/cmake-message.patch @@ -0,0 +1,20 @@ +Description: Only use OTB_GIT_STATUS_MESSAGE in message function if set. + Build failed with: + CMake Error at CMakeLists.txt:400 (message): + message called with incorrect number of arguments +Author: Bas Couwenberg <[email protected]> +Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1258 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -397,7 +397,9 @@ endmacro() + + message("\n======================= Begin of OTB cmake summary =======================\n") + +-message( ${OTB_GIT_STATUS_MESSAGE}) ++if(OTB_GIT_STATUS_MESSAGE) ++ message( ${OTB_GIT_STATUS_MESSAGE}) ++endif() + if(OTB_DATA_GIT_STATUS_MESSAGE) + message( ${OTB_DATA_GIT_STATUS_MESSAGE}) + endif() diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..47c5d50 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +cmake-message.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
