[libreoffice] 01/01: remove (now unneeded) fix-JVM_ONE_PATH_CHECK.diff again

Rene Engelhard rene at moszumanska.debian.org
Tue Nov 7 19:21:02 UTC 2017


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

rene pushed a commit to branch master
in repository libreoffice.

commit 9df98b884755f51ff62df7821b102384e382f68d
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 7 20:20:39 2017 +0100

    remove (now unneeded) fix-JVM_ONE_PATH_CHECK.diff again
---
 patches/fix-JVM_ONE_PATH_CHECK.diff | 15 ---------------
 patches/series                      |  1 -
 2 files changed, 16 deletions(-)

diff --git a/patches/fix-JVM_ONE_PATH_CHECK.diff b/patches/fix-JVM_ONE_PATH_CHECK.diff
deleted file mode 100644
index c38c591..0000000
--- a/patches/fix-JVM_ONE_PATH_CHECK.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac-old	2017-11-07 00:09:49.203188321 +0100
-+++ b/configure.ac	2017-11-07 00:10:26.419647712 +0100
-@@ -11606,12 +11606,6 @@
-     AC_MSG_CHECKING([whether to use specific JVM search path at runtime])
-     if test -n "$with_jvm_path" -a "$with_jvm_path" != "no"; then
-         AC_MSG_RESULT([yes])
--        if ! test -d "$with_jvm_path"; then
--            AC_MSG_ERROR(["$with_jvm_path" not a directory])
--        fi
--        if ! test -d "$with_jvm_path"jvm; then
--            AC_MSG_ERROR(["$with_jvm_path"jvm not found, point with_jvm_path to \[/path/to/\]jvm])
--        fi
-         JVM_ONE_PATH_CHECK="$with_jvm_path"
-         AC_SUBST(JVM_ONE_PATH_CHECK)
-     else
diff --git a/patches/series b/patches/series
index 0f944d9..98e622e 100644
--- a/patches/series
+++ b/patches/series
@@ -35,6 +35,5 @@ gb_SUPPRESS_TESTS.diff
 stop-shipping-mimelnk-desktop-files.diff
 icu-no-icu-config.diff
 ww8export-HAVE_MORE_FONTS.diff
-fix-JVM_ONE_PATH_CHECK.diff
 java9-jawt.diff
 java9-rhino.diff

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



More information about the Pkg-openoffice-commits mailing list