Cyril Brulebois <kibi@debian.org> (2017-06-15): > I was just saying this on IRC: > > “should I try to reinstate ca-certificates-java's old dependencies and > compare? from my initial bug report, that's the change in the archive > that led to the regression.” > > and mentioned earlier that given the old dependencies have an OR anyway, > we shouldn't be introducing an uninstallable package. This would have > the nice effect of being a solution that can be implemented in hours > instead of days (given openjdk-8's build time). This doesn't mean we > should jump the gun anyway… > > I'll report back. This is looking good so far: gnome upgrade path fixed, kde and xfce are still looking good, and tests with other desktop tasks are still running. If all succeed, I intend to NMU ca-certificates-java with the attached changes. I could have reintroduced the old package, but I chose to retain the svn to git changes, and to drop the version for the openjdk-7 case, since even jessie had a higher version. Attached debdiffs against current version, and previous one. KiBi.
diff -Nru ca-certificates-java-20170531/debian/changelog ca-certificates-java-20170531+nmu1/debian/changelog --- ca-certificates-java-20170531/debian/changelog 2017-05-31 15:02:23.000000000 +0200 +++ ca-certificates-java-20170531+nmu1/debian/changelog 2017-06-15 17:33:00.000000000 +0200 @@ -1,3 +1,13 @@ +ca-certificates-java (20170531+nmu1) unstable; urgency=high + + * Non-maintainer upload. + * Revert to depending on openjdk-7 instead of openjdk-8, since this triggers + a failure to dist-upgrade, due to the triggers loop (See: #864597). The + openjdk-7 package was dropped from stretch, but the java7-runtime-headless + alternative dependency is satisfied by openjdk-8. + + -- Cyril Brulebois <kibi@debian.org> Thu, 15 Jun 2017 17:33:00 +0200 + ca-certificates-java (20170531) unstable; urgency=medium * Team upload. diff -Nru ca-certificates-java-20170531/debian/rules ca-certificates-java-20170531+nmu1/debian/rules --- ca-certificates-java-20170531/debian/rules 2017-05-31 15:00:28.000000000 +0200 +++ ca-certificates-java-20170531+nmu1/debian/rules 2017-06-15 17:31:24.000000000 +0200 @@ -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-8-jre-headless" + -Vjre:Depends="openjdk-7-jre-headless" nss_lib = libnss3 else SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.10-2~)" \ - -Vjre:Depends="openjdk-8-jre-headless" + -Vjre:Depends="openjdk-7-jre-headless" nss_lib = libnss3 endif
diff -Nru ca-certificates-java-20161107/debian/changelog ca-certificates-java-20170531+nmu1/debian/changelog
--- ca-certificates-java-20161107/debian/changelog 2016-11-07 13:45:23.000000000 +0100
+++ ca-certificates-java-20170531+nmu1/debian/changelog 2017-06-15 17:33:00.000000000 +0200
@@ -1,3 +1,21 @@
+ca-certificates-java (20170531+nmu1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Revert to depending on openjdk-7 instead of openjdk-8, since this triggers
+ a failure to dist-upgrade, due to the triggers loop (See: #864597). The
+ openjdk-7 package was dropped from stretch, but the java7-runtime-headless
+ alternative dependency is satisfied by openjdk-8.
+
+ -- Cyril Brulebois <kibi@debian.org> Thu, 15 Jun 2017 17:33:00 +0200
+
+ca-certificates-java (20170531) unstable; urgency=medium
+
+ * Team upload.
+ * Depend on openjdk-8 instead of openjdk-7 (Closes: #863803)
+ * Moved the package to Git
+
+ -- Emmanuel Bourg <ebourg@apache.org> Wed, 31 May 2017 15:02:23 +0200
+
ca-certificates-java (20161107) unstable; urgency=medium
* Team upload.
diff -Nru ca-certificates-java-20161107/debian/control ca-certificates-java-20170531+nmu1/debian/control
--- ca-certificates-java-20161107/debian/control 2016-11-07 13:41:49.000000000 +0100
+++ ca-certificates-java-20170531+nmu1/debian/control 2017-05-31 15:00:11.000000000 +0200
@@ -8,8 +8,8 @@
James Page <james.page@ubuntu.com>
Build-Depends: debhelper (>= 9), default-jdk, javahelper, junit4
Standards-Version: 3.9.8
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/ca-certificates-java
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/ca-certificates-java/
+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
Package: ca-certificates-java
Architecture: all
diff -Nru ca-certificates-java-20161107/debian/rules ca-certificates-java-20170531+nmu1/debian/rules
--- ca-certificates-java-20161107/debian/rules 2016-03-21 14:05:28.000000000 +0100
+++ ca-certificates-java-20170531+nmu1/debian/rules 2017-06-15 17:31:24.000000000 +0200
@@ -6,7 +6,7 @@
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 (>= 7~u3-2.1.1~pre1-1)"
+ -Vjre:Depends="openjdk-7-jre-headless"
nss_lib = libnss3
else
SUBSTVARS = -Vnss:Depends="libnss3 (>= 3.12.10-2~)" \
diff -Nru ca-certificates-java-20161107/src/test/java/org/debian/security/KeyStoreHandlerTest.java ca-certificates-java-20170531+nmu1/src/test/java/org/debian/security/KeyStoreHandlerTest.java
--- ca-certificates-java-20161107/src/test/java/org/debian/security/KeyStoreHandlerTest.java 2016-03-21 12:56:15.000000000 +0100
+++ ca-certificates-java-20170531+nmu1/src/test/java/org/debian/security/KeyStoreHandlerTest.java 2017-05-31 14:39:26.000000000 +0200
@@ -26,7 +26,7 @@
/**
* @author Emmanuel Bourg
- * @version $Revision: 17927 $, $Date: 2014-03-24 13:32:19 +0100 (Mon, 24 Mar 2014) $
+ * @version $Revision$, $Date$
*/
public class KeyStoreHandlerTest {
Attachment:
signature.asc
Description: Digital signature