Tony Mancill pushed to branch master at Debian Java Maintainers / commons-daemon
Commits: 7a92b9a5 by tony mancill at 2022-07-09T20:36:10-07:00 Correct patch for modern JVM detection (Closes: #935336) Thank you to Chris Hofstaedtler for the correction. - - - - - e88311f2 by tony mancill at 2022-07-09T21:09:15-07:00 Prepare changelog for upload to unstable - - - - - 2 changed files: - debian/changelog - debian/patches/debian-935336.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +commons-daemon (1.0.15-10) unstable; urgency=medium + + * Team upload. + * Correct patch for modern JVM detection (Closes: #935336) + Thank you to Chris Hofstaedtler. + + -- tony mancill <[email protected]> Sat, 09 Jul 2022 20:37:07 -0700 + commons-daemon (1.0.15-9) unstable; urgency=medium * Team upload. ===================================== debian/patches/debian-935336.patch ===================================== @@ -1,10 +1,14 @@ Description: locate more recent JVM (including OpenJDK) -Author: Graeme Vetterlein <[email protected]> +Author: Graeme Vetterlein <[email protected]>, + Chris Hofstaedtler <[email protected]> Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935336 +Last-Update: 2022-07-09 ---- a/src/native/unix/native/location.c -+++ b/src/native/unix/native/location.c -@@ -115,6 +115,7 @@ +Index: commons-daemon-1.0.15/src/native/unix/native/location.c +=================================================================== +--- commons-daemon-1.0.15.orig/src/native/unix/native/location.c ++++ commons-daemon-1.0.15/src/native/unix/native/location.c +@@ -115,6 +115,7 @@ char *location_jvm_default[] = { "$JAVA_HOME/jre/lib/libjvm.so", "$JAVA_HOME/lib/classic/libjvm.so", "$JAVA_HOME/lib/client/libjvm.so", @@ -12,3 +16,11 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935336 "$JAVA_HOME/lib/libjvm.so", "$JAVA_HOME/jre/bin/classic/libjvm.so", "$JAVA_HOME/jre/bin/client/libjvm.so", +@@ -149,6 +150,7 @@ char *location_jvm_configured[] = { + #elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD) || defined(OS_FREEBSD) || defined(OS_TRU64) + "$JAVA_HOME/jre/lib/" CPU "/$VM_NAME/libjvm.so", /* Sun JDK 1.3 */ + "$JAVA_HOME/lib/" CPU "/$VM_NAME/libjvm.so", /* Sun JRE 1.3 */ ++ "$JAVA_HOME/lib/$VM_NAME/libjvm.so", + #elif defined(OS_HPUX) + "$JAVA_HOME/jre/lib/" CPU "/$VM_NAME/libjvm." SO_EXT, + "$JAVA_HOME/lib/" CPU "/$VM_NAME/libjvm." SO_EXT, View it on GitLab: https://salsa.debian.org/java-team/commons-daemon/-/compare/268890025dde188cf8f69282a20efedbfe9fa559...e88311f2d26ce93ef6246d8088053337efc0d333 -- View it on GitLab: https://salsa.debian.org/java-team/commons-daemon/-/compare/268890025dde188cf8f69282a20efedbfe9fa559...e88311f2d26ce93ef6246d8088053337efc0d333 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
