Re: Bug#864597: upgrade-reports: jessie -> stretch: gnome fails to upgrade: cycle found while processing triggers

2017-06-16 Thread Cyril Brulebois 
Emmanuel Bourg  (2017-06-15):
> Is this the only solution?

Probably not, but reverting the single change that triggered the
regression looks like a safe way to unbreak this situation. Especially
when the said change only happened many months after the relevant
package was removed from the archive (2017-05-31 vs. 2016-04-22)…

> That's a bit odd to retain the openjdk-7 dependency on
> ca-certificates-java and potentially stick with it forever.

This is incorrect. See my reply in:
  https://bugs.debian.org/864597#100

> Maybe we should simply remove the JRE dependency on
> ca-certificates-java and move the keystore generation to openjdk-8.
> That would also solve the circular dependency (#864657).

Tentative release date minus days isn't the time to deal with circular
dependencies IMHO.

> If you upload a NMU could you please push the changes to the Git
> repository?

Not possible since I'm not a member of pkg-java, and since you don't
seem to allow non-member access:
| $ git push origin HEAD $(git describe)
| Counting objects: 6, done.
| Delta compression using up to 4 threads.
| Compressing objects: 100% (6/6), done.
| Writing objects: 100% (6/6), 1.66 KiB | 0 bytes/s, done.
| Total 6 (delta 3), reused 0 (delta 0)
| remote: error: insufficient permission for adding an object to repository 
database ./objects
| remote: fatal: failed to write object
| error: unpack failed: unpack-objects abnormal exit
| To ssh://git.debian.org/git/pkg-java/ca-certificates-java.git
|  ! [remote rejected] HEAD -> master (unpacker error)
|  ! [remote rejected] debian/20170531+nmu1 -> debian/20170531+nmu1 (unpacker 
error)
| error: failed to push some refs to 
'ssh://git.debian.org/git/pkg-java/ca-certificates-java.git'

git format-patch -1 attached though.


KiBi.
From aff0969f1233ae2a60cd1d6679ce2abfe218facb Mon Sep 17 00:00:00 2001
From: Cyril Brulebois 
Date: Fri, 16 Jun 2017 08:01:25 +0200
Subject: [PATCH] Revert to depending on openjdk-7 instead of openjdk-8 (See:
 #864597).

This change triggered a failure to dist-upgrade, due to the triggers
loop.

The openjdk-7 package was dropped from stretch, but the
java7-runtime-headless alternative dependency is satisfied by openjdk-8.
---
 debian/changelog | 10 ++
 debian/rules |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7304327..8357713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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   Thu, 15 Jun 2017 17:33:00 +0200
+
 ca-certificates-java (20170531) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 28363d3..8f78b46 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-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
 
-- 
2.1.4



signature.asc
Description: Digital signature
__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Re: Bug#864597: upgrade-reports: jessie -> stretch: gnome fails to upgrade: cycle found while processing triggers

2017-06-15 Thread Cyril Brulebois 
Emmanuel Bourg  (2017-06-15):
> If you upload a NMU could you please push the changes to the Git
> repository?

I'll look into this when I've slept a bit. Reminders/prods welcome.


KiBi.


signature.asc
Description: Digital signature
__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Re: Bug#864597: upgrade-reports: jessie -> stretch: gnome fails to upgrade: cycle found while processing triggers

2017-06-15 Thread Emmanuel Bourg 
Le 15/06/2017 à 18:09, Cyril Brulebois a écrit :

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

Is this the only solution? That's a bit odd to retain the openjdk-7
dependency on ca-certificates-java and potentially stick with it
forever. Maybe we should simply remove the JRE dependency on
ca-certificates-java and move the keystore generation to openjdk-8. That
would also solve the circular dependency (#864657).

If you upload a NMU could you please push the changes to the Git repository?

Emmanuel Bourg

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Re: Bug#864597: upgrade-reports: jessie -> stretch: gnome fails to upgrade: cycle found while processing triggers

2017-06-15 Thread Cyril Brulebois 
Cyril Brulebois  (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.0 +0200
+++ ca-certificates-java-20170531+nmu1/debian/changelog	2017-06-15 17:33:00.0 +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   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.0 +0200
+++ ca-certificates-java-20170531+nmu1/debian/rules	2017-06-15 17:31:24.0 +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.0 +0100
+++ ca-certificates-java-20170531+nmu1/debian/changelog	2017-06-15 17:33:00.0 +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   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   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.0 +0100
+++ ca-certificates-java-20170531+nmu1/debian/control	2017-05-31 15:00:11.0 +0200
@@ -8,8 +8,8 @@
James Page 
 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.0 +0100
+++ ca-certificates-java-20170531+nmu1/debian/rules	2017-06-15 17:31:24.0 +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~)" \
-