Replace extension .gpg by .pgp on download/debian page

Author: flashcode

weechat/debian/models.py

@@ -78,21 +78,21 @@ def path_packages_gz(self, arch):
     def apt_url(self):
         """
         Return the URL to use with apt for binary packages, for example:
-        "deb [signed-by=/usr/share/keyrings/weechat-archive-keyring.gpg]
+        "deb [signed-by=/usr/share/keyrings/weechat-archive-keyring.pgp]
         https://weechat.org/debian sid main".
         """
         return (f'deb [signed-by=/usr/share/keyrings/weechat-archive-'
-                f'keyring.gpg] {self.url} {self.version.codename} main')
+                f'keyring.pgp] {self.url} {self.version.codename} main')
 
     def apt_url_src(self):
         """
         Return the URL to use with apt for sources packages, for example:
         "deb-src [signed-by=/usr/share/keyrings/weechat-archive-
-        keyring.gpg] https://weechat.org/debian sid main".
+        keyring.pgp] https://weechat.org/debian sid main".
         """
         return (
             f'deb-src [signed-by=/usr/share/keyrings/weechat-'
-            f'archive-keyring.gpg] {self.url} {self.version.codename} main'
+            f'archive-keyring.pgp] {self.url} {self.version.codename} main'
         )
 
     class Meta:

weechat/download/models.py

@@ -173,7 +173,7 @@ def fullname(self):
             return files_path_join(self.directory)
         return ''
 
-    def fullname_gpg_sig(self):
+    def fullname_pgp_sig(self):
         """Return the path for the GPG signature."""
         return self.fullname() + '.asc'
 
@@ -197,9 +197,9 @@ def checksum(self):
             return self.sha1sum
         return ''
 
-    def has_gpg_sig(self):
+    def has_pgp_sig(self):
         """Checks if the package has a GPG signature."""
-        return os.path.isfile(self.fullname_gpg_sig())
+        return os.path.isfile(self.fullname_pgp_sig())
 
     def exists(self):
         """Checks if the package exists (on disk)."""

weechat/templates/download/debian.html

@@ -67,7 +67,7 @@ <h4>{% trans "PGP key" %}</h4>
 <p>
   {% trans "Import the PGP key used to sign the repositories:" %}
   <pre><code>$ sudo mkdir -p /usr/share/keyrings
-$ sudo gpg --no-default-keyring --keyring /usr/share/keyrings/weechat-archive-keyring.gpg --keyserver hkps://keys.openpgp.org --recv-keys 11E9DE8848F2B65222AA75B8D1820DB22A11534E</code></pre>
+$ sudo gpg --no-default-keyring --keyring /usr/share/keyrings/weechat-archive-keyring.pgp --keyserver hkps://keys.openpgp.org --recv-keys 11E9DE8848F2B65222AA75B8D1820DB22A11534E</code></pre>
 </p>
 
 <p>
@@ -108,7 +108,7 @@ <h4>{% trans "APT configuration" %}</h4>
   <ul>
     <li>
       {% trans "If you're using an architecture like amd64 and apt complains about binary-i386 file not found, you can force the architecture like this:" %}
-      <pre><code>deb [arch=amd64 signed-by=/usr/share/keyrings/weechat-archive-keyring.gpg] https://…</code></pre>
+      <pre><code>deb [arch=amd64 signed-by=/usr/share/keyrings/weechat-archive-keyring.pgp] https://…</code></pre>
     </li>
     <li>
       {% trans "The second command line is optional, it is used to download source packages." %}

weechat/templates/download/packages.html

@@ -97,7 +97,7 @@ <h6>{% trans "Packages:" %}</h6>
           {% if package.exists %}
             <a href="/files{{ package.type.htmldir }}/{{ package.filename }}" title="{{ package.type.description }}">{{ package.filename }}</a>
             <small class="text-muted">
-              ({{ package.filesize|filesizeformat }}{% if package.display_time %}, {{ package.filedate|localdate:"datetime" }}{% endif %}{% if package.has_checksum %}, <a href="{% url 'package_checksums' package.version.version package.checksum_type %}" title="{% trans "Checksum" %} ({{ package.checksum_type|upper }}): {{ package.checksum }}">{{ package.checksum_type|upper }}</a>{% endif %}{% if package.has_gpg_sig %}, <a href="/files{{ package.type.htmldir }}/{{ package.filename }}.asc" title="{% trans "PGP signature" %}">PGP</a>{% endif %})
+              ({{ package.filesize|filesizeformat }}{% if package.display_time %}, {{ package.filedate|localdate:"datetime" }}{% endif %}{% if package.has_checksum %}, <a href="{% url 'package_checksums' package.version.version package.checksum_type %}" title="{% trans "Checksum" %} ({{ package.checksum_type|upper }}): {{ package.checksum }}">{{ package.checksum_type|upper }}</a>{% endif %}{% if package.has_pgp_sig %}, <a href="/files{{ package.type.htmldir }}/{{ package.filename }}.asc" title="{% trans "PGP signature" %}">PGP</a>{% endif %})
             </small>
           {% else %}
             <span class="text-muted" title="{{ package.type.description }}">{{ package.filename }}</span>