From 9bb616bedf328190846703886fb3ef75437e8dbe Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Thu, 5 Oct 2006 23:08:09 +0000
Subject: [PATCH] Minor changes to README.html.in and generation of
README.html: cope with unofficial, official beta and official release CDs
better. Let's not repeat the sarge mistake. Closes: #312604
---
CONF.sh | 12 ++++++++++++
Makefile | 4 ++--
data/etch/README.html.in | 19 +++++++++++++++----
data/sarge/README.html.in | 19 +++++++++++++++----
debian/CONF.sh | 12 ++++++++++++
debian/changelog | 3 +++
tools/add-bin-doc | 4 ++--
7 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/CONF.sh b/CONF.sh
index 49a45aae..79d28f18 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -334,3 +334,15 @@ export OMIT_RELEASE_NOTES=1
# Set this to override the defaul location
#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"
+
+case "$OFFICIAL"x in
+ "Official"x)
+ export OFFICIAL_VAL=2
+ ;;
+ "Official Beta"x)
+ export OFFICIAL_VAL=1
+ ;;
+ *)
+ export OFFICIAL_VAL=0
+ ;;
+esac
diff --git a/Makefile b/Makefile
index 58e7e568..4e9d7405 100755
--- a/Makefile
+++ b/Makefile
@@ -586,14 +586,14 @@ $(SDIR)/CD1/README.html:
$$dir/README.mirrors.html $$dir/README.non-US; \
cpp -traditional -undef -P -C -Wall -nostdinc -I $$dir/ \
-D OMIT_MANUAL="$(OMIT_MANUAL)" \
- -D OFFICIAL=$(OFFICIAL) \
+ -D OFFICIAL_VAL=$(OFFICIAL_VAL) \
-D OUTPUTtext $(BASEDIR)/data/$(CODENAME)/README.html.in \
| sed -e 's/%%.//g' > $$dir/README.html ; \
lynx -dump -force_html $$dir/README.html | todos \
> $$dir/README.txt ; \
cpp -traditional -undef -P -C -Wall -nostdinc -I $$dir/ \
-D OMIT_MANUAL="$(OMIT_MANUAL)" \
- -D OFFICIAL=$(OFFICIAL) \
+ -D OFFICIAL_VAL=$(OFFICIAL_VAL) \
-D OUTPUThtml $(BASEDIR)/data/$(CODENAME)/README.html.in \
| sed -e 's/%%.//g' > $$dir/README.html ; \
rm -f $$dir/README.diskdefines ; \
diff --git a/data/etch/README.html.in b/data/etch/README.html.in
index a9c94114..4ba9b013 100644
--- a/data/etch/README.html.in
+++ b/data/etch/README.html.in
@@ -432,21 +432,32 @@ Last-Minute Notes
#endif
-#if OFFICIAL != Official
-
-
-You should keep in mind that this is an unofficial CD of the current
+
+#if OFFICIAL_VAL == 0
+You should keep in mind that this is an unofficial CD of the Debian
+system. This means that all sorts of bugs may be present anywhere in
+the system. Please report any bugs you find to the person that gave
+you this CD, not Debian.
+#endif
+#if OFFICIAL_VAL == 1
+You should keep in mind that this is a beta CD of the current
development version of the Debian system. This means that all sorts of
bugs may be present anywhere in the system.
+#endif
+#if OFFICIAL_VAL == 2
+This is an official release of the Debian system. Please report any
+bugs you find in the Debian Bug Tracking System; details at bugs.debian.org.
+#endif
#endif
-#endif
#if TYPEbinary
#if OUTPUTtext
diff --git a/data/sarge/README.html.in b/data/sarge/README.html.in
index bbcf1453..487b111f 100644
--- a/data/sarge/README.html.in
+++ b/data/sarge/README.html.in
@@ -432,21 +432,32 @@ Last-Minute Notes
#endif
-#if OFFICIAL != Official
-
-
-You should keep in mind that this is an unofficial CD of the current
+
+#if OFFICIAL_VAL == 0
+You should keep in mind that this is an unofficial CD of the Debian
+system. This means that all sorts of bugs may be present anywhere in
+the system. Please report any bugs you find to the person that gave
+you this CD, not Debian.
+#endif
+#if OFFICIAL_VAL == 1
+You should keep in mind that this is a beta CD of the current
development version of the Debian system. This means that all sorts of
bugs may be present anywhere in the system.
+#endif
+#if OFFICIAL_VAL == 2
+This is an official release of the Debian system. Please report any
+bugs you find in the Debian Bug Tracking System; details at bugs.debian.org.
+#endif
#endif
-#endif
#if TYPEbinary
#if OUTPUTtext
diff --git a/debian/CONF.sh b/debian/CONF.sh
index 49a45aae..79d28f18 100644
--- a/debian/CONF.sh
+++ b/debian/CONF.sh
@@ -334,3 +334,15 @@ export OMIT_RELEASE_NOTES=1
# Set this to override the defaul location
#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"
+
+case "$OFFICIAL"x in
+ "Official"x)
+ export OFFICIAL_VAL=2
+ ;;
+ "Official Beta"x)
+ export OFFICIAL_VAL=1
+ ;;
+ *)
+ export OFFICIAL_VAL=0
+ ;;
+esac
diff --git a/debian/changelog b/debian/changelog
index 3acff700..ce2b4fe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -161,6 +161,9 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
[ Steve McIntyre ]
* Update the suggested DVD size in CONF.sh to a saner number
* Re-sync CONF.sh over debian/CONF.sh
+ * Minor changes to README.html.in and generation of README.html:
+ cope with unofficial, official beta and official release CDs
+ better. Let's not repeat the sarge mistake. Closes: #312604
-- Steve McIntyre <93sam@debian.org> Thu, 5 Oct 2006 23:51:42 +0100
diff --git a/tools/add-bin-doc b/tools/add-bin-doc
index 5c39c6d5..309e70d8 100755
--- a/tools/add-bin-doc
+++ b/tools/add-bin-doc
@@ -35,7 +35,7 @@ for i in $BDIR/*.packages; do
cpp -traditional -undef -P -C -Wall -nostdinc -I$dir \
-D OMIT_MANUAL="$OMIT_MANUAL" \
-D OMIT_RELEASE_NOTES="$OMIT_RELEASE_NOTES" \
- -D OFFICIAL="$OFFICIAL" \
+ -D OFFICIAL_VAL=$OFFICIAL_VAL \
-D OUTPUTtext $BASEDIR/data/$CODENAME/README.html.in \
| sed -e 's/%%.//g' > $dir/README.html
@@ -45,7 +45,7 @@ for i in $BDIR/*.packages; do
cpp -traditional -undef -P -C -Wall -nostdinc -I $dir/ \
-D OMIT_MANUAL="$OMIT_MANUAL" \
-D OMIT_RELEASE_NOTES="$OMIT_RELEASE_NOTES" \
- -D OFFICIAL="$OFFICIAL" \
+ -D OFFICIAL_VAL=$OFFICIAL_VAL \
-D OUTPUThtml $BASEDIR/data/$CODENAME/README.html.in \
| sed -e 's/%%.//g' > $dir/README.html