From e2fcc79f55da704dc89388e7e3c2b87500d8015c Mon Sep 17 00:00:00 2001
From: Osamu Aoki <osamu@debian.org>
Date: Mon, 18 Sep 2017 13:25:32 +0900
Subject: [PATCH] Update for the long road to Buster

Signed-off-by: Osamu Aoki <osamu@debian.org>
---
 Makefile | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 3a7328ec..c18a335f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,14 @@ NOPDF	:=
 # languages to build document
 LANGALL	=	en $(LANGPO)
 
-# Chenge at the last moment (this package is part of web page)
-#RELEASE_STATE := testing
-RELEASE_STATE := stable
+# Change at the last moment (this package is part of web page)
+# from testing -> stable just before stable release
+
+# Update release name when setting back RELEASE_STATE
+# from stable -> testing just after stable release
+
+RELEASE_STATE := testing
+#RELEASE_STATE := stable
 
 ifndef TMPDIR
 TMPDIR	:= $(CURDIR)/tmp
@@ -176,19 +181,21 @@ common.ent: $(MANUAL).raw.xml
 	echo "<!ENTITY build-date \"$(shell date -u +'%F %T %Z')\">"	>  common.ent
 	echo "<!ENTITY arch \"$(ARCH)\">"				>> common.ent
 ifeq ($(RELEASE_STATE),stable)
+	# Aim to prepare for the upcoming stable release from sid/unstable
+	echo "<!ENTITY codename-stable  \"buster\">"			>> common.ent
+	echo "<!ENTITY Codename-stable  \"Buster\">"			>> common.ent
+	echo "<!ENTITY codename-testing  \"bullseye\">"			>> common.ent
+	echo "<!ENTITY Codename-testing  \"Bullseye\">"			>> common.ent
+	echo "<!ENTITY codename-nexttesting  \"bullseye+1\">"		>> common.ent
+	echo "<!ENTITY Codename-nexttesting  \"Bullseye+1\">"		>> common.ent
+else
+	# Live with 2 year testing release from sid/unstable
 	echo "<!ENTITY codename-stable  \"stretch\">"			>> common.ent
 	echo "<!ENTITY Codename-stable  \"Stretch\">"                   >> common.ent
-	echo "<!ENTITY codename-testing  \"buster\">"		>> common.ent
-	echo "<!ENTITY Codename-testing  \"Buster\">"		>> common.ent
+	echo "<!ENTITY codename-testing  \"buster\">"			>> common.ent
+	echo "<!ENTITY Codename-testing  \"Buster\">"			>> common.ent
 	echo "<!ENTITY codename-nexttesting  \"bullseye\">"		>> common.ent
 	echo "<!ENTITY Codename-nexttesting  \"Bullseye\">"		>> common.ent
-else
-	echo "<!ENTITY codename-stable   \"jessie\">"			>> common.ent
-	echo "<!ENTITY Codename-stable   \"Jessie\">"                  >> common.ent
-	echo "<!ENTITY codename-testing  \"stretch\">"			>> common.ent
-	echo "<!ENTITY Codename-testing  \"Stretch\">"                   >> common.ent
-	echo "<!ENTITY codename-nexttesting  \"buster\">"		>> common.ent
-	echo "<!ENTITY Codename-nexttesting  \"Buster\">"		>> common.ent
 endif
 	echo "<!ENTITY codename-unstable \"sid\">"			>> common.ent
 	echo "<!ENTITY Codename-unstable \"Sid\">"                      >> common.ent