On 29/05/2022 16.16, Adam D. Barratt wrote:
Unfortunately the amd64 upload got rejected:
Version check failed:
Your upload included the binary package nvidia-openjdk-8-jre, version
9.+8u332-ga-1~deb9u1~11.2.2-3+deb11u2, for amd64,
however experimental already has version 9.+8u332-ga-1~11.5.1-2.
Uploads to proposed-updates must have a lower version than present in
experimental.
Oh yes. 1~d < 1
1~d~1 > 1~1
Is there a similar constraint for sid as well? I would have expected
that to trigger first ... and probably s/already/only/ ...
Before I upload a fix, I'd like you to double check that these versions
do not validate the ordering rules:
nvidia-openjdk-8-jre_9.+8u332-ga-1~~deb9u1~11.2.2-3+deb11u3_amd64.deb
nvidia-openjdk-8-jre_9.+8u312-b07-1~11.2.2+8u302-b08-1~11.2.2-3+deb11u3_ppc64el.deb
nvidia-openjdk-8-jre | 9.+8u312-b07-1~11.2.2-3+deb11u1~bpo10+1 |
buster-backports/non-free | amd64, ppc64el
nvidia-openjdk-8-jre | 9.+8u312-b07-1~11.2.2-3+deb11u1 |
stable/non-free | amd64, ppc64el
nvidia-openjdk-8-jre | 9.+8u312-b07-1~11.2.2+8u302-b08-1~11.2.2-3+deb11u2 |
proposed-updates/non-free | ppc64el
nvidia-openjdk-8-jre | 9.+8u312-b07-1~11.4.3-2+b2 |
testing/non-free | amd64, ppc64el
nvidia-openjdk-8-jre | 9.+8u332-ga-1~11.4.3-3 |
unstable/non-free | amd64, ppc64el
nvidia-openjdk-8-jre | 9.+8u332-ga-1~11.5.1-2 |
experimental/non-free | amd64, ppc64el
Andreas
From cc22d938063d02ab5f193b6fc7d845ee5e9e57ce Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Mon, 30 May 2022 01:28:04 +0200
Subject: [PATCH] fix nvidia-openjdk-8-jre version ordering
---
debian/changelog | 6 ++++++
debian/rules | 2 +-
debian/rules.version_prefix | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f68e95e..63bcae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-cuda-toolkit (11.2.2-3+deb11u3) UNRELEASED; urgency=medium
+
+ * Fix nvidia-openjdk-8-jre version ordering.
+
+ -- Andreas Beckmann <a...@debian.org> Sun, 29 May 2022 21:50:33 +0200
+
nvidia-cuda-toolkit (11.2.2-3+deb11u2) bullseye; urgency=medium
* Use a snapshot of openjdk-8-jre (8u332-ga-1~deb9u1) for amd64.
diff --git a/debian/rules b/debian/rules
index ce9a8b5..f568fa6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,7 +100,7 @@ jre_depends.Debian ?= $(if $(jre_pkg),$(jre_pkg_dep) |) openjdk-8-jre
jre_depends.Ubuntu ?= openjdk-8-jre | $(jre_pkg_dep)
ifneq (,$(jre_pkg))
-$(jre_pkg).VERSION = $(OPENJDK_VERSION)
+$(jre_pkg).VERSION = $(subst ~,~~,$(OPENJDK_VERSION))
endif
ifneq (,$(thrust_pkg))
diff --git a/debian/rules.version_prefix b/debian/rules.version_prefix
index 9194940..b351e0f 100644
--- a/debian/rules.version_prefix
+++ b/debian/rules.version_prefix
@@ -11,7 +11,7 @@ nvidia-cuda-gdb.PREV_VERSION = 11.2.152
nvidia-profiler.PREV_VERSION = 11.2.152
nvidia-openjdk-8-jre.VERSION_PREFIX = 9.+
-nvidia-openjdk-8-jre.PREV_VERSION = 9.+8u332-ga-1~deb9u1
+nvidia-openjdk-8-jre.PREV_VERSION = 9.+8u332-ga-1~~deb9u1
ifeq (ppc64el,$(DEB_HOST_ARCH))
nvidia-openjdk-8-jre.VERSION_PREFIX = 9.+8u312-b07-1~11.2.2+
nvidia-openjdk-8-jre.PREV_VERSION = 9.+8u312-b07-1~11.2.2+8u302-b08-1
--
2.20.1
