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

backport fix for 612224

This commit is contained in:
Steve McIntyre 2011-02-22 21:05:31 +00:00
parent 130b8d255f
commit a442b506c8
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
squeeze/debian/changelog
View File

@ -3,6 +3,10 @@ debian-cd (3.1.6) UNRELEASED; urgency=low
* Add the missing accent in my family name in Uploaders. * Add the missing accent in my family name in Uploaders.
* Drop Frans Pop from Uploaders, RIP. * Drop Frans Pop from Uploaders, RIP.
[ backports from trunk ]
* Remove win32-loader standalone flavours from the tools/ directory on
x86. Closes: #612224
-- Raphaël Hertzog <hertzog@debian.org> Fri, 04 Feb 2011 09:59:21 +0100 -- Raphaël Hertzog <hertzog@debian.org> Fri, 04 Feb 2011 09:59:21 +0100
debian-cd (3.1.5) unstable; urgency=high debian-cd (3.1.5) unstable; urgency=high

2
squeeze/tools/boot/squeeze/boot-x86
View File

@ -123,6 +123,8 @@ if [ "$NN" = "1" ]; then
[ "$OMIT_DOC_TOOLS" != "1" ] ; then [ "$OMIT_DOC_TOOLS" != "1" ] ; then
echo " Adding tools to CD1" echo " Adding tools to CD1"
$BASEDIR/tools/add_files $CDDIR $MIRROR tools $BASEDIR/tools/add_files $CDDIR $MIRROR tools
# Remove the win32-loader/ subdirectory from tools, as d-i already installs setup.exe
rm -Rf $CDDIR/tools/win32-loader
fi fi
fi fi