[javatools] 01/03: jarwrapper: Removed GCJ support

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository javatools.

commit cbff0a23e137fdb2da9d668d6c6bb260c548e686
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 23 22:40:14 2018 +0100

    jarwrapper: Removed GCJ support
---
 debian/changelog | 4 ++++
 jarwrapper       | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2cafd50..0c0700e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 javatools (0.63) UNRELEASED; urgency=medium
 
+  [ tony mancill ]
   * Team upload.
   * Drop --parallel argument to dh sequencer (lintian warning)
   * Bump Standards-Version to 4.1.3
@@ -8,6 +9,9 @@ javatools (0.63) UNRELEASED; urgency=medium
   * Drop build-dep on libtest-simpler-perl and fix broken tests
   * Drop dependency on gcj-jdk (Closes: #892530)
 
+  [ Emmanuel Bourg ]
+  * jarwrapper: Removed GCJ support
+
  -- tony mancill <tmancill at debian.org>  Sun, 11 Mar 2018 12:26:55 -0700
 
 javatools (0.62) unstable; urgency=medium
diff --git a/jarwrapper b/jarwrapper
index 9a5b57e..e3427b7 100755
--- a/jarwrapper
+++ b/jarwrapper
@@ -38,11 +38,6 @@ MULTIARCH_LIBRARY_PATH_32BIT="/usr/lib/jni:/usr/lib/arm-linux-gnueabi/jni:/usr/l
 MULTIARCH_LIBRARY_PATH_64BIT="/usr/lib/jni:/usr/lib/alpha-linux-gnu/jni:/usr/lib/x86_64-linux-gnu/jni:/usr/lib/aarch64-linux-gnu/jni:/usr/lib/x86_64-kfreebsd-gnu/jni:/usr/lib/powerpc64-linux-gnu/jni:/usr/lib/powerpc64le-linux-gnu/jni:/usr/lib/s390x-linux-gnu/jni:/usr/lib/sparc64-linux-gnu/jni"
 
 if which "$JAVA" >/dev/null 2>&1; then
-    if java --version 2>&1 | grep "GNU libgcj" > /dev/null; then
-        # Let GNU gij handle the library path by itself
-        export LD_LIBRARY_PATH=/usr/lib/jni
-        exec $JAVA $JAVAOPTS -jar "$JAR" "$@"
-    fi
     if java -d32 2>&1 | grep "does not support" > /dev/null; then
         # 64bit
         export LD_LIBRARY_PATH=$MULTIARCH_LIBRARY_PATH_64BIT

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