[ca-certificates-java] 02/02: Upload new ca-certificates-java to unstable

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository ca-certificates-java.

commit 4b472ef6435747bb606d7693d4767ae4899db4e3
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Fri Sep 29 12:34:23 2017 +0200

    Upload new ca-certificates-java to unstable
---
 debian/changelog            | 12 ++++++++++++
 debian/jks-keystore.hook.in |  6 +++++-
 debian/postinst.in          |  6 +++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8357713..c895a19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ca-certificates-java (20170929) unstable; urgency=low
+
+  [ Gianfranco Costamagna ]
+  * Team upload.
+  * Ack previous NMU, thanks
+
+  [ Rico Tzschichholz ]
+  * Fix temporary jvm-*.cfg generation on armhf (Closes: #874276)
+    - the armhf installation path is different from other architectures.
+
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Wed, 27 Sep 2017 17:17:59 +0200
+
 ca-certificates-java (20170531+nmu1) unstable; urgency=high
 
   * Non-maintainer upload.
diff --git a/debian/jks-keystore.hook.in b/debian/jks-keystore.hook.in
index 7569e61..5826628 100644
--- a/debian/jks-keystore.hook.in
+++ b/debian/jks-keystore.hook.in
@@ -53,7 +53,11 @@ if [ ! -f /etc/${jvm%-$arch}/jvm-$arch.cfg ]; then
     # the jre is not yet configured, but jvm.cfg is needed to run it
     temp_jvm_cfg=/etc/${jvm%-$arch}/jvm-$arch.cfg
     mkdir -p /etc/${jvm%-$arch}
-    printf -- "-server KNOWN\n" > $temp_jvm_cfg
+    if [ "$arch" == "armhf" ]; then
+        printf -- "-client KNOWN\n-server ALIASED_TO -client\n" > $temp_jvm_cfg
+    else
+        printf -- "-server KNOWN\n" > $temp_jvm_cfg
+    fi
 fi
 
 if dpkg-query --version >/dev/null; then
diff --git a/debian/postinst.in b/debian/postinst.in
index 213b54c..72ccbaa 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -100,7 +100,11 @@ case "$1" in
                 # the jre is not yet configured, but jvm.cfg is needed to run it
                 temp_jvm_cfg=/etc/${jvm%-$arch}/jvm-$arch.cfg
                 mkdir -p /etc/${jvm%-$arch}
-                printf -- "-server KNOWN\n" > $temp_jvm_cfg
+                if [ "$arch" == "armhf" ]; then
+	                printf -- "-client KNOWN\n-server ALIASED_TO -client\n" > $temp_jvm_cfg
+                else
+	                printf -- "-server KNOWN\n" > $temp_jvm_cfg
+                fi
             fi
 
             trap do_cleanup EXIT

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