From: Peter Eisentraut <peter@eisentraut.org>
Date: Sun, 11 Feb 2024 08:59:16 +0000 (+0100)
Subject: Branch off 16/17
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/%20?a=commitdiff_plain;h=c0ec7814bc9517b5b5d30eda8f0d402f376ed86d;p=pgtranslation%2Fadmin.git

Branch off 16/17

master is now version 17, and version 16 has its own branch.

Note: Unlike previous branchings like this, the web site now shows the
master branch as "17-branch" rather than "master".  That way this
stays correct even after PostgreSQL branches later in the year.
---

diff --git a/wwwtools/messages-branches.txt b/wwwtools/messages-branches.txt
index 4fb0509..3ebd63b 100644
--- a/wwwtools/messages-branches.txt
+++ b/wwwtools/messages-branches.txt
@@ -1,4 +1,5 @@
-messages-16-branch		master
+messages-17-branch		master
+messages-16-branch		REL_16_STABLE
 messages-15-branch		REL_15_STABLE
 messages-14-branch		REL_14_STABLE
 messages-13-branch		REL_13_STABLE
diff --git a/wwwtools/nls-status-page b/wwwtools/nls-status-page
index 846b35c..ababf6d 100755
--- a/wwwtools/nls-status-page
+++ b/wwwtools/nls-status-page
@@ -83,7 +83,8 @@ my %branch_status = (
     '13-branch' => 'maintenance',
     '14-branch' => 'maintenance',
     '15-branch' => 'maintenance',
-    '16-branch' => 'complete this now',
+    '16-branch' => 'maintenance',
+    '17-branch' => 'complete this now',
 );
 
 my @branches = reverse sort {
diff --git a/wwwtools/postgresql-branches.txt b/wwwtools/postgresql-branches.txt
index 91b71f7..1719eea 100644
--- a/wwwtools/postgresql-branches.txt
+++ b/wwwtools/postgresql-branches.txt
@@ -1,3 +1,4 @@
+postgresql-17-branch	master
 postgresql-16-branch	REL_16_STABLE
 postgresql-15-branch	REL_15_STABLE
 postgresql-14-branch	REL_14_STABLE
diff --git a/wwwtools/update-nls-www b/wwwtools/update-nls-www
index 1aaa6b5..ac28614 100755
--- a/wwwtools/update-nls-www
+++ b/wwwtools/update-nls-www
@@ -30,7 +30,7 @@ while true; do
 	esac
 done
 
-active_branches="16-branch 15-branch 14-branch 13-branch 12-branch"
+active_branches="17-branch 16-branch 15-branch 14-branch 13-branch 12-branch"
 
 if [ -n "$1" ]; then
 	active_branches=$1