From c661a1d41ba6a2a1ce66028eb26d83a17d51da5a Mon Sep 17 00:00:00 2001
From: Christoph Berg <myon@debian.org>
Date: Wed, 9 Apr 2025 14:06:03 +0200
Subject: [PATCH] Upgrade Debian/Ubuntu installation instructions

* Use /etc/os-release instead of lsb_release
* Update list of distribution releases covere
* Drop i386 and s390x architectures
* Use PG 17 in package name examples
---
 templates/pages/download/linux/debian.html | 16 ++++++++--------
 templates/pages/download/linux/ubuntu.html | 19 ++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/templates/pages/download/linux/debian.html b/templates/pages/download/linux/debian.html
index 8f628deb..7216112e 100644
--- a/templates/pages/download/linux/debian.html
+++ b/templates/pages/download/linux/debian.html
@@ -39,6 +39,7 @@ The PostgreSQL Apt repository supports the current versions of Debian:
   <li>bookworm (12.x)</li>
   <li>bullseye (11.x)</li>
   <li>buster (10.x)</li>
+  <li>trixie (testing)</li>
   <li>sid (unstable)</li>
 </ul>
 <p>
@@ -47,9 +48,7 @@ on the following architectures:
 <ul>
   <li>amd64</li>
   <li>arm64</li>
-  <li>i386 (buster and older)</li>
   <li>ppc64el</li>
-  <li>s390x</li>
 </ul>
 
 <p>
@@ -73,13 +72,14 @@ sudo install -d /usr/share/postgresql-common/pgdg
 sudo curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
 
 # Create the repository configuration file:
-sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+. /etc/os-release
+sudo sh -c "echo 'deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $VERSION_CODENAME-pgdg main' > /etc/apt/sources.list.d/pgdg.list"
 
 # Update the package lists:
 sudo apt update
 
 # Install the latest version of PostgreSQL:
-# If you want a specific version, use 'postgresql-16' or similar instead of 'postgresql'
+# If you want a specific version, use 'postgresql-17' or similar instead of 'postgresql'
 sudo apt -y install postgresql</pre>
     <button id="copy-btn2" class="pg-script-copy-btn">Copy Script</button>
 </div>
@@ -99,15 +99,15 @@ version number as required):
 <table class="table table-striped">
   <tbody>
     <tr>
-     <th scope="row">postgresql-client-16</th>
+     <th scope="row">postgresql-client-17</th>
      <td>client libraries and client binaries</td>
     </tr>
     <tr>
-     <th scope="row">postgresql-16</th>
+     <th scope="row">postgresql-17</th>
      <td>core database server</td>
     </tr>
     <tr>
-     <th scope="row">postgresql-doc-16</th>
+     <th scope="row">postgresql-doc-17</th>
      <td>documentation</td>
     </tr>
     <tr>
@@ -115,7 +115,7 @@ version number as required):
      <td>libraries and headers for C language frontend development</td>
     </tr>
     <tr>
-     <th scope="row">postgresql-server-dev-16</th>
+     <th scope="row">postgresql-server-dev-17</th>
      <td>libraries and headers for C language backend development</td>
     </tr>
   </tbody>
diff --git a/templates/pages/download/linux/ubuntu.html b/templates/pages/download/linux/ubuntu.html
index 19c0a318..c02d1c27 100644
--- a/templates/pages/download/linux/ubuntu.html
+++ b/templates/pages/download/linux/ubuntu.html
@@ -33,11 +33,12 @@ updates for all supported versions of PostgreSQL throughout the support
 <a href="/support/versioning/">lifetime</a> of PostgreSQL.
 </p>
 <p>
-The PostgreSQL Apt Repository supports the current versions of Ubuntu:
+The PostgreSQL Apt repository supports the current versions of Ubuntu:
 </p>
 <ul>
+  <li>plucky (25.04, non-LTS)</li>
+  <li>oracular (24.10, non-LTS)</li>
   <li>noble (24.04, LTS)</li>
-  <li>mantic (23.10, non-LTS)</li>
   <li>jammy (22.04, LTS)</li>
   <li>focal (20.04, LTS)</li>
 </ul>
@@ -48,7 +49,6 @@ on the following architectures:
   <li>amd64</li>
   <li>arm64 (LTS releases only)</li>
   <li>ppc64el (LTS releases only)</li>
-  <li>s390x (LTS releases only)</li>
 </ul>
 
 <p>
@@ -72,13 +72,14 @@ sudo install -d /usr/share/postgresql-common/pgdg
 sudo curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
 
 # Create the repository configuration file:
-sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+. /etc/os-release
+sudo sh -c "echo 'deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $VERSION_CODENAME-pgdg main' > /etc/apt/sources.list.d/pgdg.list"
 
 # Update the package lists:
 sudo apt update
 
 # Install the latest version of PostgreSQL:
-# If you want a specific version, use 'postgresql-16' or similar instead of 'postgresql'
+# If you want a specific version, use 'postgresql-17' or similar instead of 'postgresql'
 sudo apt -y install postgresql</pre>
     <button id="copy-btn2" class="pg-script-copy-btn">Copy Script</button>
 </div>
@@ -98,15 +99,15 @@ version number as required):
 <table class="table table-striped">
   <tbody>
     <tr>
-     <th scope="row">postgresql-client-16</th>
+     <th scope="row">postgresql-client-17</th>
      <td>client libraries and client binaries</td>
     </tr>
     <tr>
-     <th scope="row">postgresql-16</th>
+     <th scope="row">postgresql-17</th>
      <td>core database server</td>
     </tr>
     <tr>
-     <th scope="row">postgresql-doc-16</th>
+     <th scope="row">postgresql-doc-17</th>
      <td>documentation</td>
     </tr>
     <tr>
@@ -114,7 +115,7 @@ version number as required):
      <td>libraries and headers for C language frontend development</td>
     </tr>
     <tr>
-     <th scope="row">postgresql-server-dev-16</th>
+     <th scope="row">postgresql-server-dev-17</th>
      <td>libraries and headers for C language backend development</td>
     </tr>
   </tbody>
-- 
2.39.5