Make sure the DEBIAN_KERNEL placeholder in README.* is replaced;

switch from cpp to sed for that so it works inside quoted
text. Closes: #699198
This commit is contained in:
Steve McIntyre 2013-01-29 18:22:44 +00:00
parent 7a57363472
commit 4b512541d8
2 changed files with 5 additions and 4 deletions

3
debian/changelog vendored
View File

@ -18,6 +18,9 @@ debian-cd (3.1.12) UNRELEASED; urgency=low
+ Print out the accumulated size of source packages in output also + Print out the accumulated size of source packages in output also
(fix to printf format string) (fix to printf format string)
* Update Vcs-Browser * Update Vcs-Browser
* Make sure the DEBIAN_KERNEL placeholder in README.* is replaced;
switch from cpp to sed for that so it works inside quoted
text. Closes: #699198
-- Steve McIntyre <93sam@debian.org> Wed, 26 Sep 2012 01:09:13 +0100 -- Steve McIntyre <93sam@debian.org> Wed, 26 Sep 2012 01:09:13 +0100

View File

@ -55,9 +55,8 @@ cpp -traditional -undef -P -C -Wall -nostdinc -I$dir \
-D OMIT_MANUAL="$OMIT_MANUAL" \ -D OMIT_MANUAL="$OMIT_MANUAL" \
-D OFFICIAL_VAL=$OFFICIAL_VAL \ -D OFFICIAL_VAL=$OFFICIAL_VAL \
-D OMIT_RELEASE_NOTES="$OMIT_RELEASE_NOTES" \ -D OMIT_RELEASE_NOTES="$OMIT_RELEASE_NOTES" \
-D DEBIAN_KERNEL="$DEBIAN_KERNEL" \
-D OUTPUTtext $BASEDIR/data/$CODENAME/README.html.in \ -D OUTPUTtext $BASEDIR/data/$CODENAME/README.html.in \
| sed -e 's/%%.//g' > $dir/README.html | sed -e "s/%%.//g;s,DEBIAN_KERNEL,$DEBIAN_KERNEL,g" > $dir/README.html
rm -f $dir/README.txt rm -f $dir/README.txt
lynx -dump -force_html $dir/README.html | todos \ lynx -dump -force_html $dir/README.html | todos \
@ -69,9 +68,8 @@ cpp -traditional -undef -P -C -Wall -nostdinc -I $dir/ \
-D OMIT_MANUAL="$OMIT_MANUAL" \ -D OMIT_MANUAL="$OMIT_MANUAL" \
-D OFFICIAL_VAL=$OFFICIAL_VAL \ -D OFFICIAL_VAL=$OFFICIAL_VAL \
-D OMIT_RELEASE_NOTES="$OMIT_RELEASE_NOTES" \ -D OMIT_RELEASE_NOTES="$OMIT_RELEASE_NOTES" \
-D DEBIAN_KERNEL="$DEBIAN_KERNEL" \
-D OUTPUThtml $BASEDIR/data/$CODENAME/README.html.in \ -D OUTPUThtml $BASEDIR/data/$CODENAME/README.html.in \
| sed -e 's/%%.//g' > $dir/README.html | sed -e "s/%%.//g;s,DEBIAN_KERNEL,$DEBIAN_KERNEL,g" > $dir/README.html
rm -f $dir/README.diskdefines rm -f $dir/README.diskdefines
mkdir -p $dir/pics mkdir -p $dir/pics