Merge ~vpa1977/ubuntu/+source/openjdk-20:ubuntu/devel into ubuntu/+source/openjdk-20:ubuntu/devel

[Vladimir Petko]

This merge proposal is a pre-requisite for ca-certificates-java MP[1]

Summary of changes:
  * debian/JB-jre-headless.postinst.in: trigger ca-certificates-java after jre is set up.

PPA: ppa:vpa1977/ca-certificates-java-dpkg [2]

Steps to test:
 autopkgtests should pass

autopkgtest [00:12:08]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS (superficial)
command2 PASS (superficial)

[1] https://code.launchpad.net/~vpa1977/ubuntu/+source/ca-certificates-java/+git/ca-certificates-java/+merge/438150
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/ca-certificates-java-dpkg

[Steve Langasek (vorlon)]

review: Approve

diff --git a/debian/JB-jre-headless.postinst.in b/debian/JB-jre-headless.postinst.in
index c40abb8..b764c47 100644
--- a/debian/JB-jre-headless.postinst.in
+++ b/debian/JB-jre-headless.postinst.in
@@ -93,6 +93,10 @@ configure)
         update-binfmts --package @basename@ --import jar || true
     fi
 
+    # Now that java is fully registered and configured,
+    # call update-ca-certificates-java
+    dpkg-trigger update-ca-certificates-java
+
     ;;
 
 esac
diff --git a/debian/changelog b/debian/changelog
index 8d0584d..b5c6033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openjdk-20 (20~26ea-1ubuntu1) lunar; urgency=medium
+
+  * debian/JB-jre-headless.postinst.in: trigger ca-certificates-java after jre
+    is set up.
+  * debian/tests/control: use openjdk-20-jre-headless for smoke tests.
+
+ -- Vladimir Petko <[e-mail]>  Wed, 01 Mar 2023 15:24:44 +1300
+
 openjdk-20 (20~26ea-1) unstable; urgency=medium
 
   * OpenJDK 20 snapshot, build 26 (rampdown phase one).
diff --git a/debian/control b/debian/control
index 6f3e3c1..49b9ed6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: openjdk-20
 Section: java
 Priority: optional
-Maintainer: OpenJDK Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: OpenJDK Team <[e-mail]>
 Uploaders: Matthias Klose <[e-mail]>
 Build-Depends: debhelper (>= 11),
   m4, lsb-release, zip, unzip,
diff --git a/debian/control.in b/debian/control.in
index e42ea41..2a55d4c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,8 @@
 Source: @basename@
 Section: java
 Priority: optional
-Maintainer: OpenJDK Team <@basename@@packages.debian.org>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: OpenJDK Team <@basename@@packages.debian.org>
 Uploaders: Matthias Klose <[e-mail]>
 Build-Depends: @bd_debhelper@
   m4, lsb-release, zip, unzip,
diff --git a/debian/tests/control b/debian/tests/control
index 592e331..dfa3eac 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,9 +1,9 @@
 Test-Command: java --version
-Depends: openjdk-18-jre-headless
+Depends: openjdk-20-jre-headless
 Restrictions: superficial
 
 Test-Command: javac --version
-Depends: openjdk-18-jdk-headless
+Depends: openjdk-20-jdk-headless
 Restrictions: superficial
 
 #Tests: hotspot, jaxp, langtools