fix(pkgrepo.debian): bring into line with latest install docs

* and bootstrap changes salt-bootstrap#2121

salt/osfamilymap.yaml

@@ -20,7 +20,7 @@
 
 
 Debian:
-  pkgrepo: 'deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp arch=amd64]
+  pkgrepo: 'deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg]
               {{ salt_repo }}/saltproject-deb stable main'
   pkgrepo_keyring: '{{ salt_repo_key_url }}'
   pkgrepo_keyring_hash:

salt/pkgrepo/debian/install.sls

@@ -2,25 +2,35 @@
 # vim: ft=sls
 {% from "salt/map.jinja" import salt_settings with context %}
 
+{% set salt_3008_or_newer = grains["saltversioninfo"] >= [3008] -%}
+
 salt-pkgrepo-install-saltstack-debian-keyring:
   file.managed:
-    - name: /etc/apt/keyrings/salt-archive-keyring.pgp
-    - source: {{ salt_settings.pkgrepo_keyring }}
-    - source_hash: {{ salt_settings.pkgrepo_keyring_hash }}
+    - name: /etc/apt/keyrings/salt-archive-keyring.gpg
+    - source: salt://salt/pkgrepo/debian/files/salt-archive-keyring.gpg
     - require_in:
       - pkgrepo: salt-pkgrepo-install-saltstack-debian
 
-salt-pkgrepo-install-saltstack-debian-remove-old-repo-file:
+salt-pkgrepo-install-saltstack-debian-remove-old-files:
   file.absent:
-    - name: /etc/apt/sources.list.d/saltstack.list
+    - names:
+{%- if salt_3008_or_newer %}
+      - /etc/apt/sources.list.d/salt.list
+{%- else %}
+      - /etc/apt/sources.list.d/salt.sources
+{%- endif %}
+      - /etc/apt/sources.list.d/saltstack.list
+      - /etc/apt/keyrings/salt-archive-keyring.pgp
     - require_in:
       - pkgrepo: salt-pkgrepo-install-saltstack-debian
 
+{% set source_ext = "sources" if salt_3008_or_newer else "list" -%}
+
 salt-pkgrepo-install-saltstack-debian:
   pkgrepo.managed:
-    - humanname: SaltStack Debian Repo
+    - humanname: Salt Project
     - name: {{ salt_settings.pkgrepo }}
-    - file: /etc/apt/sources.list.d/salt.list
+    - file: /etc/apt/sources.list.d/salt.{{ source_ext }}
     {% if salt_settings.get('key_url') is not none %}
     - key_url: {{ salt_settings.key_url }}
     {% endif %}

test/integration/default/files/_mapdata/debian-12.yaml

@@ -87,7 +87,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp arch=amd64]
+    pkgrepo: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg]
       https://packages.broadcom.com/artifactory/saltproject-deb stable main
     pkgrepo_keyring: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
     pkgrepo_keyring_hash: sha256=36decef986477acb8ba2a1fc4041bcf9f22229ef6c939d0317c9e36a9d142b34