Dear maintainer,
I've uploaded an NMU for plplot (versioned as 5.10.0+dfsg2-0.4). The
diff is attached to this message.
Regards
Ole
diff -Nru plplot-5.10.0+dfsg2/debian/changelog plplot-5.10.0+dfsg2/debian/changelog
--- plplot-5.10.0+dfsg2/debian/changelog 2016-08-03 21:18:45.000000000 +0200
+++ plplot-5.10.0+dfsg2/debian/changelog 2016-09-20 09:12:35.000000000 +0200
@@ -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 <oleb...@debian.org> Tue, 20 Sep 2016 09:12:35 +0200
+
plplot (5.10.0+dfsg2-0.3) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru plplot-5.10.0+dfsg2/debian/patches/cmake-3.1.diff plplot-5.10.0+dfsg2/debian/patches/cmake-3.1.diff
--- plplot-5.10.0+dfsg2/debian/patches/cmake-3.1.diff 2016-02-15 16:14:28.000000000 +0100
+++ plplot-5.10.0+dfsg2/debian/patches/cmake-3.1.diff 2016-09-19 15:14:35.000000000 +0200
@@ -29,10 +29,8 @@
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 @@
#
# 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
