Merge ~vpa1977/ubuntu/+source/openjdk-18:ca-certificates-java-dpkg into ubuntu/+source/openjdk-18:ubuntu/devel

Proposed by Vladimir Petko
Status: Merged
Merged at revision: 47bade58ff440a220d422f413a89c2c50661e13c
Proposed branch: ~vpa1977/ubuntu/+source/openjdk-18:ca-certificates-java-dpkg
Merge into: ubuntu/+source/openjdk-18:ubuntu/devel
Diff against target: 58 lines (+15/-2)
4 files modified
debian/JB-jre-headless.postinst.in (+4/-0)
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
Reviewer Review Type Date Requested Status
git-ubuntu import Pending
Review via email: mp+438160@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

Autopkgtests results:
Autopkgtest [17:22:45]: @@@@@@@@@@@@@@@@@@@@ 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.

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 2a6da58..3987912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openjdk-18 (18.0.2+9-2ubuntu1) lunar; urgency=medium
2
3 * debian/JB-jre-headless.postinst.in: trigger ca-certificates-java after jre
4 is set up.
5
6 -- Vladimir Petko <vladimir.petko@canonical.com> Thu, 02 Mar 2023 10:12:37 +1300
7
1openjdk-18 (18.0.2+9-2) unstable; urgency=medium8openjdk-18 (18.0.2+9-2) unstable; urgency=medium
29
3 * Don't hard-code the name of the jtreg package.10 * Don't hard-code the name of the jtreg package.
diff --git a/debian/control b/debian/control
index 7c69afc..2416806 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
1Source: openjdk-181Source: openjdk-18
2Section: java2Section: java
3Priority: optional3Priority: optional
4Maintainer: OpenJDK Team <openjdk-18@packages.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: OpenJDK Team <openjdk-18@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 436d3b4..b3cd92f 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,

Subscribers

People subscribed via source and target branches