This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ca-certificates-java.
commit 53651f7939e6f35694ee31e5ef0376f1bfce7e55 Author: Matthias Klose <[email protected]> Date: Sat Sep 30 02:02:28 2017 +0200 Import Debian version 20170930 ca-certificates-java (20170930) unstable; urgency=medium * Team upload. * Revert the last two NMUs. - Depend again on openjdk-8 after the stretch release. - Stop fiddling around with jvm-*.cfg files. ca-certificates-java has no business with providing an initial cacerts file. This is implemented in the openjdk packages. We are not 2008 anymore. * Bump standards version. * Remove Torsten Werner as uploader. --- debian/changelog | 13 +++++++++++++ debian/control | 5 ++--- debian/jks-keystore.hook.in | 6 +----- debian/postinst.in | 12 ------------ debian/rules | 4 ++-- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index c895a19..7abbf79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +ca-certificates-java (20170930) unstable; urgency=medium + + * Team upload. + * Revert the last two NMUs. + - Depend again on openjdk-8 after the stretch release. + - Stop fiddling around with jvm-*.cfg files. ca-certificates-java + has no business with providing an initial cacerts file. This is + implemented in the openjdk packages. We are not 2008 anymore. + * Bump standards version. + * Remove Torsten Werner as uploader. + + -- Matthias Klose <[email protected]> Sat, 30 Sep 2017 02:02:28 +0200 + ca-certificates-java (20170929) unstable; urgency=low [ Gianfranco Costamagna ] diff --git a/debian/control b/debian/control index 201afe2..e99ab65 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,10 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Matthias Klose <[email protected]>, - Torsten Werner <[email protected]>, Damien Raude-Morvan <[email protected]>, James Page <[email protected]> Build-Depends: debhelper (>= 9), default-jdk, javahelper, junit4 -Standards-Version: 3.9.8 +Standards-Version: 4.1.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/ca-certificates-java.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/ca-certificates-java.git @@ -15,7 +14,7 @@ Package: ca-certificates-java Architecture: all Multi-Arch: foreign Depends: ca-certificates (>= 20121114), - ${jre:Depends} | java7-runtime-headless, + ${jre:Depends} | java8-runtime-headless, ${misc:Depends}, ${nss:Depends} # We need a versioned Depends due to multiarch changes (bug #635571). diff --git a/debian/jks-keystore.hook.in b/debian/jks-keystore.hook.in index 5826628..7569e61 100644 --- a/debian/jks-keystore.hook.in +++ b/debian/jks-keystore.hook.in @@ -53,11 +53,7 @@ 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} - 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 + printf -- "-server KNOWN\n" > $temp_jvm_cfg fi if dpkg-query --version >/dev/null; then diff --git a/debian/postinst.in b/debian/postinst.in index 72ccbaa..d02a660 100644 --- a/debian/postinst.in +++ b/debian/postinst.in @@ -95,18 +95,6 @@ case "$1" in exit 1 fi - temp_jvm_cfg= - 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} - 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 first_install fi diff --git a/debian/rules b/debian/rules index 8f78b46..28363d3 100755 --- a/debian/rules +++ b/debian/rules @@ -6,11 +6,11 @@ ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.9+ckbi-1.82-0ubuntu3~)" \ - -Vjre:Depends="openjdk-7-jre-headless" + -Vjre:Depends="openjdk-8-jre-headless" nss_lib = libnss3 else SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.10-2~)" \ - -Vjre:Depends="openjdk-7-jre-headless" + -Vjre:Depends="openjdk-8-jre-headless" nss_lib = libnss3 endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ca-certificates-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
