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

* In start_new_disc, cope with $DEBVERSION containing spaces 

* Only put the release notes and installation guide on disc#1
This commit is contained in:
Steve McIntyre 2007-04-04 16:40:18 +00:00
parent 45d56341c0
commit b695b182c4
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
debian-cd (3.0.3) UNRELEASED; urgency=high
[ Steve McIntyre ]
* In start_new_disc, cope with $DEBVERSION containing spaces
* Only put the release notes and installation guide on disc#1
-- Steve McIntyre <93sam@debian.org> Wed, 28 Mar 2007 22:57:41 +0100
debian-cd (3.0.2) unstable; urgency=high
[ Steve McIntyre ]

24
tools/start_new_disc
View File

@ -203,7 +203,7 @@ if [ $DISKNUM = 1 ] ; then
echo " Adding docs to CD1"
$BASEDIR/tools/add_files $CDDIR $MIRROR doc
find $CDDIR/doc -name "dedication-*" | grep -v $DEBVERSION | xargs rm -f
find $CDDIR/doc -name "dedication-*" | grep -v "$DEBVERSION" | xargs rm -f
find $CDDIR/doc -name "debian-keyring.tar.gz" | xargs rm -f
if [ ! -e $CDDIR/doc/FAQ/html ] ; then
@ -217,6 +217,13 @@ if [ $DISKNUM = 1 ] ; then
fi
fi
# Installtools
mkdir $CDDIR/install
if [ -x "$BASEDIR/tools/$CODENAME/installtools.sh" ] ; then
echo " Adding installtools"
$BASEDIR/tools/$CODENAME/installtools.sh $CDDIR "$ARCHES"
fi
for ARCH in $ARCHES
do
if [ -e $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH ] ; then
@ -244,19 +251,11 @@ fi
echo " Adding common docs on CD#$DISKNUM"
$BASEDIR/tools/add-bin-doc $DISKNUM "$ARCHES"
# Common stuff for all disks
# Common stuff for all disks in the set
if [ "$SOURCEONLY"x = "yes"x ] ; then
echo -n "-J " >> $BDIR/$DISKNUM.mkisofs_opts
else
# Installtools
mkdir $CDDIR/install
if [ -x "$BASEDIR/tools/$CODENAME/installtools.sh" ] ; then
echo " Adding installtools"
$BASEDIR/tools/$CODENAME/installtools.sh $CDDIR "$ARCHES"
fi
fi
echo " Adding Release files"
# Release files
cd $CDDIR
@ -284,6 +283,8 @@ if [ -e "$MIRROR/dists/$CODENAME/Release" ] ; then
# Update some other information as well
sed -e "s/^Architectures: .*$/Architectures: $ARCHES/" \
$MIRROR/dists/$CODENAME/Release | \
# sed -e "s/^Suite: .*$/Suite: stable/" | \
# sed -e "s/^Description: .*$/Description: Debian $DEBVERSION/" | \
sed -e "s|^Components: .*$|Components: $SECTIONS|" | \
perl -ne 'if (/^(MD5Sum|SHA1|SHA256):/i) { $f=1; next }
if ($f) {
@ -304,11 +305,13 @@ do
mkdir -p dists/$CODENAME/$SECT/binary-$ARCH
cp $MIRROR/dists/$CODENAME/$SECT/binary-$ARCH/Release \
dists/$CODENAME/$SECT/binary-$ARCH/
# sed -i "s/^Archive:.*$/Archive: stable/" dists/$CODENAME/$SECT/binary-$ARCH/Release
fi
if [ -n "$NONUS" -a -e "$NONUS/dists/$CODENAME/non-US/$SECT/binary-$ARCH/Release" ] ; then
mkdir -p dists/$CODENAME/non-US/$SECT/binary-$ARCH
cp $NONUS/dists/$CODENAME/non-US/$SECT/binary-$ARCH/Release \
dists/$CODENAME/non-US/$SECT/binary-$ARCH/
# sed -i "s/^Archive:.*$/Archive: stable/" dists/$CODENAME/non-US/$SECT/binary-$ARCH/Release
fi
done
@ -324,6 +327,7 @@ do
mkdir -p dists/$CODENAME/main/debian-installer/binary-$ARCH
cp $MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release \
dists/$CODENAME/main/debian-installer/binary-$ARCH/
# sed -i "s/^Archive:.*$/Archive: stable/" dists/$CODENAME/main/debian-installer/binary-$ARCH/Release
fi
done