From 2239cc1f2c1f8697f275e8ab8d868ac08f3d6788 Mon Sep 17 00:00:00 2001
From: "Jonathan S. Katz" <jonathan.katz@excoventures.com>
Date: Fri, 24 Apr 2020 12:11:43 -0400
Subject: [PATCH] Update Debian and Ubuntu versions

- Debian: Add bullseye and sid
- Ubuntu: Add focal (20.04)
- Add arm64 architecture to each package page
- Modify examples to use PostgreSQL 12

Author: Christoph Berg <myon@debian.org>
---
 templates/pages/download/linux/debian.html | 15 ++++++++++-----
 templates/pages/download/linux/ubuntu.html | 13 ++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/templates/pages/download/linux/debian.html b/templates/pages/download/linux/debian.html
index f5ab13ce..370a32f8 100644
--- a/templates/pages/download/linux/debian.html
+++ b/templates/pages/download/linux/debian.html
@@ -28,11 +28,14 @@ versions of Debian:
   <li>Buster (10.x)</li>
   <li>Stretch (9.x)</li>
   <li>Jessie (8.x)</li>
+  <li>Bullseye (11.x, testing)</li>
+  <li>Sid (unstable)</li>
 </ul>
 <p>on the following architectures:</p>
 <ul>
   <li>amd64</li>
-  <li>i386</li>
+  <li>arm64 (Buster and newer)</li>
+  <li>i386 (Buster and older)</li>
   <li>ppc64el</li>
 </ul>
 <p>
@@ -45,6 +48,8 @@ To use the apt repository, follow these steps:
    <option value="buster">Buster (10.x)</option>
    <option value="stretch">Stretch (9.x)</option>
    <option value="jessie">Jessie (8.x)</option>
+   <option value="bullseye">Bullseye (11.x, testing)</option>
+   <option value="sid">Sid (unstable)</option>
   </select>
  </li>
  <li>
@@ -72,7 +77,7 @@ Debian includes PostgreSQL by default. To install PostgreSQL on
 Debian, use the <code>apt-get</code> (or other apt-driving) command:
 </p>
 <pre class="code">
-  apt-get install postgresql-11
+  apt-get install postgresql-12
 </pre>
 <p>
 The repository contains many different packages including third party
@@ -82,11 +87,11 @@ version number as required):
 <table class="table table-striped">
   <tbody>
     <tr>
-     <th scope="row">postgresql-client-11</th>
+     <th scope="row">postgresql-client-12</th>
      <td>client libraries and client binaries</td>
     </tr>
     <tr>
-     <th scope="row">postgresql-11</th>
+     <th scope="row">postgresql-12</th>
      <td>core database server</td>
     </tr>
     <tr>
@@ -98,7 +103,7 @@ version number as required):
      <td>libraries and headers for C language frontend development</td>
     </tr>
     <tr>
-     <th scope="row">postgresql-server-dev-11</th>
+     <th scope="row">postgresql-server-dev-12</th>
      <td>libraries and headers for C language backend development</td>
     </tr>
     <tr>
diff --git a/templates/pages/download/linux/ubuntu.html b/templates/pages/download/linux/ubuntu.html
index a1b7e253..138f2c87 100644
--- a/templates/pages/download/linux/ubuntu.html
+++ b/templates/pages/download/linux/ubuntu.html
@@ -22,13 +22,15 @@ updates for all supported versions of PostgreSQL throughout the support
 <p>
 The PostgreSQL Apt Repository supports the current LTS versions of Ubuntu:
 <ul>
+  <li>20.04</li>
   <li>18.04</li>
   <li>16.04</li>
 </ul>
 on the following architectures:
 <ul>
   <li>amd64</li>
-  <li>i386</li>
+  <li>arm64 (18.04 and newer)</li>
+  <li>i386 (18.04 and older)</li>
   <li>ppc64el</li>
 </ul>
 
@@ -42,6 +44,7 @@ To use the apt repository, follow these steps:
   <li>
     <select id="debseries" name="field.series" class="custom-select">
       <option selected="selected" value="YOUR_UBUNTU_VERSION_HERE">Choose your Ubuntu version</option>
+      <option value="focal">Focal (20.04)</option>
       <option value="bionic">Bionic (18.04)</option>
       <option value="xenial">Xenial (16.04)</option>
     </select>
@@ -68,7 +71,7 @@ Ubuntu includes PostgreSQL by default. To install PostgreSQL on
 Ubuntu, use the <em>apt-get</em> (or other apt-driving) command:
 </p>
 <code>
-apt-get install postgresql-11
+apt-get install postgresql-12
 </code>
 <p>
 The repository contains many different packages including third party
@@ -78,11 +81,11 @@ version number as required):
 <table class="table table-striped">
   <tbody>
     <tr>
-     <th scope="row">postgresql-client-11</th>
+     <th scope="row">postgresql-client-12</th>
      <td>client libraries and client binaries</td>
     </tr>
     <tr>
-     <th scope="row">postgresql-11</th>
+     <th scope="row">postgresql-12</th>
      <td>core database server</td>
     </tr>
     <tr>
@@ -94,7 +97,7 @@ version number as required):
      <td>libraries and headers for C language frontend development</td>
     </tr>
     <tr>
-     <th scope="row">postgresql-server-dev-11</th>
+     <th scope="row">postgresql-server-dev-12</th>
      <td>libraries and headers for C language backend development</td>
     </tr>
     <tr>
-- 
2.39.5