diff -Nru ca-certificates-java-20140324/debian/changelog ca-certificates-java-20160321/debian/changelog --- ca-certificates-java-20140324/debian/changelog 2014-03-25 05:31:14.000000000 +0100 +++ ca-certificates-java-20160321/debian/changelog 2016-03-21 14:34:49.000000000 +0100 @@ -1,3 +1,13 @@ +ca-certificates-java (20160321) unstable; urgency=medium + + * Team upload. + * Drop support for obsolete Java 6 (Closes: #776897) + * Add support for Java 8 and 9 (Closes: #775775) + * Bump Standards-Version to 3.9.7 (no changes) + * Use secure HTTPS URI for Vcs-Browser + + -- Benjamin Drung Mon, 21 Mar 2016 14:34:49 +0100 + ca-certificates-java (20140324) unstable; urgency=medium * Team upload. diff -Nru ca-certificates-java-20140324/debian/control ca-certificates-java-20160321/debian/control --- ca-certificates-java-20140324/debian/control 2014-03-25 05:31:14.000000000 +0100 +++ ca-certificates-java-20160321/debian/control 2016-03-21 14:33:54.000000000 +0100 @@ -7,15 +7,15 @@ Damien Raude-Morvan , James Page Build-Depends: debhelper (>= 9), default-jdk, javahelper, junit4 -Standards-Version: 3.9.5 +Standards-Version: 3.9.7 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/ca-certificates-java -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/ca-certificates-java/ +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/ca-certificates-java/ Package: ca-certificates-java Architecture: all Multi-Arch: foreign Depends: ca-certificates (>= 20121114), - ${jre:Depends} | java6-runtime-headless, + ${jre:Depends} | java7-runtime-headless, ${misc:Depends}, ${nss:Depends} # We need a versioned Depends due to multiarch changes (bug #635571). diff -Nru ca-certificates-java-20140324/debian/jks-keystore.hook.in ca-certificates-java-20160321/debian/jks-keystore.hook.in --- ca-certificates-java-20140324/debian/jks-keystore.hook.in 2014-03-25 05:31:14.000000000 +0100 +++ ca-certificates-java-20160321/debian/jks-keystore.hook.in 2016-03-21 14:23:13.000000000 +0100 @@ -35,8 +35,12 @@ exit 1 fi -for jvm in java-6-openjdk-$arch java-6-openjdk \ - java-7-openjdk-$arch java-7-openjdk java-6-sun; do +for jvm in java-7-openjdk-$arch java-7-openjdk \ + oracle-java7-jre-$arch oracle-java7-server-jre-$arch oracle-java7-jdk-$arch \ + java-8-openjdk-$arch java-8-openjdk \ + oracle-java8-jre-$arch oracle-java8-server-jre-$arch oracle-java8-jdk-$arch \ + java-9-openjdk-$arch java-9-openjdk \ + oracle-java9-jre-$arch oracle-java9-server-jre-$arch oracle-java9-jdk-$arch; do if [ -x /usr/lib/jvm/$jvm/bin/java ]; then break fi diff -Nru ca-certificates-java-20140324/debian/postinst.in ca-certificates-java-20160321/debian/postinst.in --- ca-certificates-java-20140324/debian/postinst.in 2014-03-25 05:31:14.000000000 +0100 +++ ca-certificates-java-20160321/debian/postinst.in 2016-03-21 14:22:05.000000000 +0100 @@ -26,8 +26,12 @@ setup_path() { - for jvm in java-6-openjdk-$arch java-6-openjdk \ - java-7-openjdk-$arch java-7-openjdk java-6-sun; do + for jvm in java-7-openjdk-$arch java-7-openjdk \ + oracle-java7-jre-$arch oracle-java7-server-jre-$arch oracle-java7-jdk-$arch \ + java-8-openjdk-$arch java-8-openjdk \ + oracle-java8-jre-$arch oracle-java8-server-jre-$arch oracle-java8-jdk-$arch \ + java-9-openjdk-$arch java-9-openjdk \ + oracle-java9-jre-$arch oracle-java9-server-jre-$arch oracle-java9-jdk-$arch; do if [ -x /usr/lib/jvm/$jvm/bin/java ]; then break fi diff -Nru ca-certificates-java-20140324/debian/rules ca-certificates-java-20160321/debian/rules --- ca-certificates-java-20140324/debian/rules 2014-03-25 05:31:14.000000000 +0100 +++ ca-certificates-java-20160321/debian/rules 2016-03-21 14:05:28.000000000 +0100 @@ -10,13 +10,13 @@ nss_lib = libnss3 else SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.10-2~)" \ - -Vjre:Depends="openjdk-6-jre-headless (>= 6b16-1.6.1-2)" + -Vjre:Depends="openjdk-7-jre-headless" nss_lib = libnss3 endif JAVA_HOME := /usr/lib/jvm/default-java export JAVA_HOME -OPTS := --no-javadoc --main=org.debian.security.UpdateCertificates --javacopts="-source 1.6 -target 1.6" +OPTS := --no-javadoc --main=org.debian.security.UpdateCertificates --javacopts="-source 1.7 -target 1.7" CLASSPATH := /usr/share/java/junit4.jar export CLASSPATH @@ -32,7 +32,7 @@ mkdir target jh_build $(OPTS) target/ca-certificates-java.jar src/main/java ifeq ($(do_junit),yes) - jh_build --no-javadoc --javacopts="-source 1.6 -target 1.6 -cp target/ca-certificates-java.jar:${CLASSPATH}" \ + jh_build --no-javadoc --javacopts="-source 1.7 -target 1.7 -cp target/ca-certificates-java.jar:${CLASSPATH}" \ target/ca-certificates-java-tests.jar src/test/java mkdir target/test-classes cp -R src/test/resources/* target/test-classes diff -Nru ca-certificates-java-20140324/pom.xml ca-certificates-java-20160321/pom.xml --- ca-certificates-java-20140324/pom.xml 2014-03-25 05:31:14.000000000 +0100 +++ ca-certificates-java-20160321/pom.xml 2016-03-21 14:31:08.000000000 +0100 @@ -4,7 +4,7 @@ org.debian ca-certificates-java - 20140324 + 20160321 jar ca-certificates-java Common CA certificates @@ -24,8 +24,8 @@ maven-compiler-plugin 2.1 - 1.6 - 1.6 + 1.7 + 1.7 diff -Nru ca-certificates-java-20140324/src/test/java/org/debian/security/KeyStoreHandlerTest.java ca-certificates-java-20160321/src/test/java/org/debian/security/KeyStoreHandlerTest.java --- ca-certificates-java-20140324/src/test/java/org/debian/security/KeyStoreHandlerTest.java 2014-03-25 05:31:14.000000000 +0100 +++ ca-certificates-java-20160321/src/test/java/org/debian/security/KeyStoreHandlerTest.java 2016-03-21 12:56:15.000000000 +0100 @@ -26,7 +26,7 @@ /** * @author Emmanuel Bourg - * @version $Revision: 17927 $, $Date: 2014-03-24 05:32:19 -0700 (Mon, 24 Mar 2014) $ + * @version $Revision: 17927 $, $Date: 2014-03-24 13:32:19 +0100 (Mon, 24 Mar 2014) $ */ public class KeyStoreHandlerTest {