diff -Nru cmake-3.10.2/debian/changelog cmake-3.10.2/debian/changelog --- cmake-3.10.2/debian/changelog 2018-04-08 15:09:31.000000000 +0000 +++ cmake-3.10.2/debian/changelog 2018-04-24 15:47:53.000000000 +0000 @@ -1,3 +1,10 @@ +cmake (3.10.2-1ubuntu2) bionic; urgency=medium + + * Fix java version comparison in upstream commit. LP: #1766649. + - FindJava: use "10" instead of "1.10". + + -- Tiago Stürmer Daitx Tue, 24 Apr 2018 15:47:53 +0000 + cmake (3.10.2-1ubuntu1) bionic; urgency=medium * Merge upstream commits: diff -Nru cmake-3.10.2/debian/patches/3c08d2075fae7ef62838f18e1af5d398c6401572.diff cmake-3.10.2/debian/patches/3c08d2075fae7ef62838f18e1af5d398c6401572.diff --- cmake-3.10.2/debian/patches/3c08d2075fae7ef62838f18e1af5d398c6401572.diff 2018-04-08 15:08:29.000000000 +0000 +++ cmake-3.10.2/debian/patches/3c08d2075fae7ef62838f18e1af5d398c6401572.diff 2018-04-24 15:47:53.000000000 +0000 @@ -11,7 +11,7 @@ - AND Java_JAVAH_EXECUTABLE AND Java_JAVADOC_EXECUTABLE) - set(Java_Development_FOUND TRUE) + Java_JAVADOC_EXECUTABLE) -+ if(Java_VERSION VERSION_LESS "1.10") ++ if(Java_VERSION VERSION_LESS "10") + list(APPEND _JAVA_REQUIRED_VARS Java_JAVAH_EXECUTABLE) + if(Java_JAVA_EXECUTABLE AND Java_JAVAC_EXECUTABLE + AND Java_JAVAH_EXECUTABLE AND Java_JAVADOC_EXECUTABLE) @@ -34,7 +34,7 @@ - Java_JAVAH_EXECUTABLE Java_JAVADOC_EXECUTABLE - VERSION_VAR Java_VERSION_STRING - ) -+ if(Java_VERSION VERSION_LESS "1.10") ++ if(Java_VERSION VERSION_LESS "10") + find_package_handle_standard_args(Java + REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAR_EXECUTABLE Java_JAVAC_EXECUTABLE + Java_JAVAH_EXECUTABLE Java_JAVADOC_EXECUTABLE