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

Proposed by Vladimir Petko
Status: Merged
Merged at revision: 0f1e35b9c780e86a589ceaa50afde54e37ae8c48
Proposed branch: ~vpa1977/ubuntu/+source/openjdk-20:ubuntu/devel
Merge into: ubuntu/+source/openjdk-20:ubuntu/devel
Diff against target: 75 lines (+18/-4)
5 files modified
debian/JB-jre-headless.postinst.in (+4/-0)
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/tests/control (+2/-2)
Reviewer Review Type Date Requested Status
Steve Langasek (community) Approve
git-ubuntu import Pending
Review via email: mp+438161@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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)
93 update-binfmts --package @basename@ --import jar || true93 update-binfmts --package @basename@ --import jar || true
94 fi94 fi
9595
96 # Now that java is fully registered and configured,
97 # call update-ca-certificates-java
98 dpkg-trigger update-ca-certificates-java
99
96 ;;100 ;;
97101
98esac102esac
diff --git a/debian/changelog b/debian/changelog
index 8d0584d..b5c6033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1openjdk-20 (20~26ea-1ubuntu1) lunar; urgency=medium
2
3 * debian/JB-jre-headless.postinst.in: trigger ca-certificates-java after jre
4 is set up.
5 * debian/tests/control: use openjdk-20-jre-headless for smoke tests.
6
7 -- Vladimir Petko <vladimir.petko@canonical.com> Wed, 01 Mar 2023 15:24:44 +1300
8
1openjdk-20 (20~26ea-1) unstable; urgency=medium9openjdk-20 (20~26ea-1) unstable; urgency=medium
210
3 * OpenJDK 20 snapshot, build 26 (rampdown phase one).11 * 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 @@
1Source: openjdk-201Source: openjdk-20
2Section: java2Section: java
3Priority: optional3Priority: optional
4Maintainer: OpenJDK Team <openjdk-20@packages.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: OpenJDK Team <openjdk-20@packages.debian.org>
5Uploaders: Matthias Klose <doko@ubuntu.com>6Uploaders: Matthias Klose <doko@ubuntu.com>
6Build-Depends: debhelper (>= 11),7Build-Depends: debhelper (>= 11),
7 m4, lsb-release, zip, unzip,8 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 @@
1Source: @basename@1Source: @basename@
2Section: java2Section: java
3Priority: optional3Priority: optional
4Maintainer: OpenJDK Team <@basename@@packages.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: OpenJDK Team <@basename@@packages.debian.org>
5Uploaders: Matthias Klose <doko@ubuntu.com>6Uploaders: Matthias Klose <doko@ubuntu.com>
6Build-Depends: @bd_debhelper@7Build-Depends: @bd_debhelper@
7 m4, lsb-release, zip, unzip,8 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 @@
1Test-Command: java --version1Test-Command: java --version
2Depends: openjdk-18-jre-headless2Depends: openjdk-20-jre-headless
3Restrictions: superficial3Restrictions: superficial
44
5Test-Command: javac --version5Test-Command: javac --version
6Depends: openjdk-18-jdk-headless6Depends: openjdk-20-jdk-headless
7Restrictions: superficial7Restrictions: superficial
88
9#Tests: hotspot, jaxp, langtools9#Tests: hotspot, jaxp, langtools

Subscribers

People subscribed via source and target branches