This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository gmt.
commit 4ea886403deb4b9fc98a55985f9611400f13a12c Author: Bas Couwenberg <[email protected]> Date: Thu Jul 9 22:29:55 2015 +0200 Don't use cmake continue() command in disable-examples.patch, requires CMake >= 3.2. --- debian/changelog | 2 ++ debian/patches/disable-examples.patch | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0599094..f9269f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ gmt (5.1.2+dfsg1-1~exp7) UNRELEASED; urgency=medium * Add patch to append 'gmt' to the man page sections. * Move `gzip -n` man page compression from rules to patch. + * Don't use cmake continue() command in disable-examples.patch, + requires CMake >= 3.2. -- Bas Couwenberg <[email protected]> Thu, 09 Jul 2015 18:46:47 +0200 diff --git a/debian/patches/disable-examples.patch b/debian/patches/disable-examples.patch index 14a5d97..8f38322 100644 --- a/debian/patches/disable-examples.patch +++ b/debian/patches/disable-examples.patch @@ -4,7 +4,7 @@ Forwarded: not-needed --- a/doc/examples/CMakeLists.txt +++ b/doc/examples/CMakeLists.txt -@@ -20,12 +20,21 @@ +@@ -20,12 +20,19 @@ file (GLOB _examples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*/*.ps") @@ -19,13 +19,20 @@ Forwarded: not-needed + + # Skip excluded examples + list (FIND _exclude_examples ${_fig} _exclude_index) -+ if (_exclude_index GREATER -1) -+ continue() -+ endif (_exclude_index GREATER -1) ++ if (_exclude_index EQUAL -1) + string (REPLACE ".ps" ".pdf" _pdf_fig ${_fig}) string (REPLACE ".ps" ".png" _png_fig ${_fig}) list (APPEND _examples_pdf ${RST_BINARY_DIR}/_images/${_pdf_fig}) +@@ -84,6 +91,8 @@ foreach (_ps ${_examples}) + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS gmt_for_img_convert ${CMAKE_CURRENT_SOURCE_DIR}/${_ps}) + endif (WIN32) ++ ++ endif (_exclude_index EQUAL -1) + endforeach (_ps ${_examples}) + + # List of job scripts and convert to verbatim --- a/doc/rst/source/Gallery.rst +++ b/doc/rst/source/Gallery.rst @@ -42,9 +42,9 @@ complex illustration. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
