[Pkg-cmake-commits] [cmake] 04/05: Remove fix-java9-detection.patch, applied upstream.

[Felix Geyer]

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

fgeyer pushed a commit to branch master
in repository cmake.

commit 542a7fbb131b746d5a5cb870093b4d4ab306c4bf
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Aug 11 12:25:45 2017 +0200

    Remove fix-java9-detection.patch, applied upstream.
---
 debian/changelog                         |  1 +
 debian/patches/fix-java9-detection.patch | 27 ---------------------------
 debian/patches/series                    |  1 -
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35188ad..8a0c5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cmake (3.9.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove fix-java9-detection.patch, applied upstream.
 
  -- Felix Geyer <fgeyer at debian.org>  Fri, 11 Aug 2017 09:33:43 +0200
 
diff --git a/debian/patches/fix-java9-detection.patch b/debian/patches/fix-java9-detection.patch
deleted file mode 100644
index be76d59..0000000
--- a/debian/patches/fix-java9-detection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e42fa012b6c3e1ce8f7c8bdcaa87f768d8f4037e Mon Sep 17 00:00:00 2001
-From: Craig Scott <craig.scott at crascit.com>
-Date: Tue, 25 Jul 2017 22:23:55 +1000
-Subject: [PATCH] Allow early access version trailing string to be mixed case
-
-The original regex was expecting to match strings like "ea", but it has
-been reported that other strings like "Debian" are also possible.
----
- Modules/FindJava.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
-index 3d32560..d762452 100644
---- a/Modules/FindJava.cmake
-+++ b/Modules/FindJava.cmake
-@@ -143,7 +143,7 @@ if(Java_JAVA_EXECUTABLE)
-       if(var MATCHES "java version \"([0-9]+\\.[0-9]+\\.[0-9_.]+.*)\"")
-         # This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
-         set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
--      elseif(var MATCHES "openjdk version \"([0-9]+)-[a-z]+\"")
-+      elseif(var MATCHES "openjdk version \"([0-9]+)-[A-Za-z]+\"")
-         # OpenJDK 9 early access builds or locally built
-         set(Java_VERSION_STRING "1.${CMAKE_MATCH_1}.0")
-       elseif(var MATCHES "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\"")
---
-libgit2 0.25.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 1ec4301..e9e2070 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 FindBoost_add_-lpthread_#563479.diff
 qt_import_dir_variable.diff
 fix-ftbfs-on-kfreebsd.patch
-fix-java9-detection.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cmake/cmake.git