Commit 53651f79 authored by Matthias Klose's avatar Matthias Klose Committed by Emmanuel Bourg
Browse files

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.
parent 4b472ef6

debian/changelog

+13 −0
Original line number Diff line number Diff line 
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 <doko@debian.org>  Sat, 30 Sep 2017 02:02:28 +0200



ca-certificates-java (20170929) unstable; urgency=low



  [ Gianfranco Costamagna ]

debian/control

+2 −3
Original line number Diff line number Diff line
@@ -3,11 +3,10 @@ Section: java 
Priority: optional

Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>

Uploaders: Matthias Klose <doko@ubuntu.com>,

           Torsten Werner <twerner@debian.org>,

           Damien Raude-Morvan <drazzib@debian.org>,

           James Page <james.page@ubuntu.com>

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).

debian/jks-keystore.hook.in

+1 −5
Original line number Diff line number Diff line
@@ -53,12 +53,8 @@ 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



if dpkg-query --version >/dev/null; then

    nsspkg=$(dpkg-query -L "$(nsslib_name)" | sed -n 's,\(.*\)/libnss3\.so$,\1,p'|head -n 1)

debian/postinst.in

+0 −12
Original line number Diff line number Diff line
@@ -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

debian/rules

+2 −2
Original line number Diff line number Diff line
@@ -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