Version in base suite: 1.0.15-8

Base version: commons-daemon_1.0.15-8
Target version: commons-daemon_1.0.15-8+deb10u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/c/commons-daemon/commons-daemon_1.0.15-8.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/c/commons-daemon/commons-daemon_1.0.15-8+deb10u1.dsc

 changelog                   |    7 +++++++
 patches/debian-935336.patch |   26 ++++++++++++++++++++++++++
 patches/series              |    1 +
 3 files changed, 34 insertions(+)

diff -Nru commons-daemon-1.0.15/debian/changelog commons-daemon-1.0.15/debian/changelog
--- commons-daemon-1.0.15/debian/changelog	2017-03-02 12:51:51.000000000 +0000
+++ commons-daemon-1.0.15/debian/changelog	2022-07-18 09:35:49.000000000 +0000
@@ -1,3 +1,10 @@
+commons-daemon (1.0.15-8+deb10u1) buster; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply patch from unstable to fix JVM detection. (Closes: #935336)
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Mon, 18 Jul 2022 09:35:49 +0000
+
 commons-daemon (1.0.15-8) unstable; urgency=medium
 
   * Team upload.
diff -Nru commons-daemon-1.0.15/debian/patches/debian-935336.patch commons-daemon-1.0.15/debian/patches/debian-935336.patch
--- commons-daemon-1.0.15/debian/patches/debian-935336.patch	1970-01-01 00:00:00.000000000 +0000
+++ commons-daemon-1.0.15/debian/patches/debian-935336.patch	2022-07-16 00:03:00.000000000 +0000
@@ -0,0 +1,26 @@
+Description: locate more recent JVM (including OpenJDK)
+Author: Graeme Vetterlein <graeme.reportbug@vetterlein.com>,
+        Chris Hofstaedtler <zeha@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935336
+Last-Update: 2022-07-09
+
+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",
++    "$JAVA_HOME/lib/server/libjvm.so",
+     "$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,
diff -Nru commons-daemon-1.0.15/debian/patches/series commons-daemon-1.0.15/debian/patches/series
--- commons-daemon-1.0.15/debian/patches/series	2017-03-02 12:51:51.000000000 +0000
+++ commons-daemon-1.0.15/debian/patches/series	2022-07-16 00:03:10.000000000 +0000
@@ -5,3 +5,4 @@
 mips_abi_n32_n64_support.diff
 arm64.diff
 ppc64el.diff
+debian-935336.patch