ubuntu: put keyring archive into version-specific file

It will ease upgrades, as the key will differ between versions, so
having different names allows shipping new keyring into older releases
without conflicts.

QubesOS/qubes-issues#7832

debian/qubes-core-agent.install

@@ -160,6 +160,7 @@ usr/share/kde4/services/*.desktop
 usr/share/keyrings/qubes-archive-keyring.gpg
 usr/share/keyrings/qubes-archive-keyring-4.2.gpg
 usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg
+usr/share/keyrings/qubes-ubuntu-archive-keyring-4.2.gpg
 usr/share/kservices5/ServiceMenus/*.desktop
 usr/share/applications/*.desktop
 usr/share/man/man1/qvm-*

package-managers/Makefile

@@ -64,7 +64,9 @@ endif
 		$(DESTDIR)/usr/share/keyrings/qubes-archive-keyring-4.2.gpg
 	ln -s qubes-archive-keyring-4.2.gpg \
 		$(DESTDIR)/usr/share/keyrings/qubes-archive-keyring.gpg
-	install -D -m 0644 apt-qubes-ubuntu-archive-keyring.gpg \
+	install -D -m 0644 apt-qubes-ubuntu-archive-keyring-4.2.gpg \
+		$(DESTDIR)/usr/share/keyrings/qubes-ubuntu-archive-keyring-4.2.gpg
+	ln -s qubes-ubuntu-archive-keyring-4.2.gpg \
 		$(DESTDIR)/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg
 	install -D -m 0644 apt-conf-00notify-hook \
 		$(DESTDIR)$(APTCONFDIR)/apt.conf.d/00notify-hook

package-managers/apt-qubes-r4-ubuntu.list.in

@@ -1,15 +1,15 @@
 # Main qubes updates repository
-deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg ] https://debu.qubes-os.org/r4.2/vm @DIST@ main
-#deb-src [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg ] https://debu.qubes-os.org/r4.2/vm @DIST@ main
+deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring-4.2.gpg ] https://debu.qubes-os.org/r4.2/vm @DIST@ main
+#deb-src [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring-4.2.gpg ] https://debu.qubes-os.org/r4.2/vm @DIST@ main
 
 # Qubes updates candidates repository
-#deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg] https://debu.qubes-os.org/r4.2/vm @DIST@-testing main
-#deb-src  [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg ]  https://debu.qubes-os.org/r4.2/vm @DIST@-testing main
+#deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring-4.2.gpg] https://debu.qubes-os.org/r4.2/vm @DIST@-testing main
+#deb-src  [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring-4.2.gpg ]  https://debu.qubes-os.org/r4.2/vm @DIST@-testing main
 
 # Qubes security updates testing repository
-#deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg] https://debu.qubes-os.org/r4.2/vm @DIST@-securitytesting main
-#deb-src  [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg ] https://debu.qubes-os.org/r4.2/vm @DIST@-securitytesting main
+#deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring-4.2.gpg] https://debu.qubes-os.org/r4.2/vm @DIST@-securitytesting main
+#deb-src  [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring-4.2.gpg ] https://debu.qubes-os.org/r4.2/vm @DIST@-securitytesting main
 
 # Qubes experimental/unstable repository
-#deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg] https://debu.qubes-os.org/r4.2/vm @DIST@-unstable main
-#deb-src  [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg ] https://debu.qubes-os.org/r4.2/vm @DIST@-unstable main
+#deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring-4.2.gpg] https://debu.qubes-os.org/r4.2/vm @DIST@-unstable main
+#deb-src  [arch=amd64 signed-by=/usr/share/keyrings/qubes-ubuntu-archive-keyring-4.2.gpg ] https://debu.qubes-os.org/r4.2/vm @DIST@-unstable main

package-managers/apt-qubes-ubuntu-archive-keyring.gpg

@@ -0,0 +1 @@
+apt-qubes-ubuntu-archive-keyring-4.2.gpg