debian: 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

@@ -158,6 +158,7 @@ usr/lib/qubes/tinyproxy-wrapper
 usr/share/glib-2.0/schemas/*
 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/kservices5/ServiceMenus/*.desktop
 usr/share/applications/*.desktop

package-managers/Makefile

@@ -60,7 +60,9 @@ else
 	sed "s/@DIST@/$(DIST)/" apt-qubes-r4.list.in \
 		> $(DESTDIR)$(APTCONFDIR)/sources.list.d/qubes-r4.list
 endif
-	install -D -m 0644 apt-qubes-archive-keyring.gpg \
+	install -D -m 0644 apt-qubes-archive-keyring-4.2.gpg \
+		$(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 \
 		$(DESTDIR)/usr/share/keyrings/qubes-ubuntu-archive-keyring.gpg

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

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

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

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