Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Steve McIntyre 2006-10-05 23:08:09 +00:00
parent c065e67805
commit 9bb616bedf
7 changed files with 61 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CONF.sh
View File

@ -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

4
Makefile
View File

@ -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 ; \

19
data/etch/README.html.in
View File

@ -432,21 +432,32 @@ Last-Minute Notes
#endif
</H2>
</a>
#if OFFICIAL != Official
<p>
<UL>
<LI>
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 <A
HREF="http://bugs.debian.org/">bugs.debian.org</A>.
#endif
<br>&nbsp;
</LI>
</UL>
#endif
#endif
#if TYPEbinary
#if OUTPUTtext

19
data/sarge/README.html.in
View File

@ -432,21 +432,32 @@ Last-Minute Notes
#endif
</H2>
</a>
#if OFFICIAL != Official
<p>
<UL>
<LI>
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 <A
HREF="http://bugs.debian.org/">bugs.debian.org</A>.
#endif
<br>&nbsp;
</LI>
</UL>
#endif
#endif
#if TYPEbinary
#if OUTPUTtext

12
debian/CONF.sh vendored
View File

@ -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

3
debian/changelog vendored
View File

@ -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

4
tools/add-bin-doc
View File

@ -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