[plplot] 63/68: Import Debian changes 5.10.0+dfsg2-0.4

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository plplot.

commit 4b55dde715b8dc3891077911bd8b0a7705efa622
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Sep 20 09:12:35 2016 +0200

    Import Debian changes 5.10.0+dfsg2-0.4
    
    plplot (5.10.0+dfsg2-0.4) unstable; urgency=medium
    
      * Non-maintainer upload.
      * Fix FTBFS with cmake >= 3.6.2. Closes: #835708
---
 debian/changelog              |  7 +++++++
 debian/patches/cmake-3.1.diff | 16 ++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ac47ea..0a14df1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plplot (5.10.0+dfsg2-0.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with cmake >= 3.6.2. Closes: #835708
+
+ -- Ole Streicher <olebole at debian.org>  Tue, 20 Sep 2016 09:12:35 +0200
+
 plplot (5.10.0+dfsg2-0.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/cmake-3.1.diff b/debian/patches/cmake-3.1.diff
index 084777a..0c32b3a 100644
--- a/debian/patches/cmake-3.1.diff
+++ b/debian/patches/cmake-3.1.diff
@@ -29,10 +29,8 @@ Date:   Sun Dec 7 09:06:08 2014 -0800
     still need to be done since the change in the pkg-config support by
     CMake may need other adjustments as well.
 
-Index: plplot-5.10.0+dfsg/cmake/modules/pkg-config.cmake
-===================================================================
---- plplot-5.10.0+dfsg.orig/cmake/modules/pkg-config.cmake
-+++ plplot-5.10.0+dfsg/cmake/modules/pkg-config.cmake
+--- a/cmake/modules/pkg-config.cmake
++++ b/cmake/modules/pkg-config.cmake
 @@ -1,6 +1,6 @@
  # cmake/modules/pkg-config.cmake
  #
@@ -41,17 +39,19 @@ Index: plplot-5.10.0+dfsg/cmake/modules/pkg-config.cmake
  #
  # This file is part of PLplot.
  #
-@@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _incl
+@@ -94,7 +94,14 @@
      set(_xprefix ${_prefix})
    endif(FORCE_EXTERNAL_STATIC)
    
 -  _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
 +  if(CMAKE_VERSION VERSION_LESS "3.1")
 +    _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+  else(CMAKE_VERSION VERSION_LESS "3.1")
++  elseif(CMAKE_VERSION VERSION_LESS "3.6.2")
 +    _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-+  endif(CMAKE_VERSION VERSION_LESS "3.1")
-+    
++  else(CMAKE_VERSION VERSION_LESS "3.6.2")
++    _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}")
++  endif(CMAKE_VERSION VERSION_LESS "3.6.2")
++
    if(${_prefix}_FOUND)
      cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}")
      # If libraries cannot be not found, then that is equivalent to whole

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git