Re: Release: things to do ???

To: Philip Hands <phil@hands.com>
Cc: debian-cd@lists.debian.org
Subject: Re: Release: things to do ???
From: "J.A. Bezemer" <costar@panic.et.tudelft.nl>
Date: Sun, 13 Aug 2000 01:07:21 +0200 (CEST)
Message-id: <[🔎] Pine.LNX.3.96.1000813005346.12873A-100000@panic.et.tudelft.nl>
In-reply-to: <[🔎] 87n1ikf5yl.fsf@sheikh.hands.com>

On 11 Aug 2000, Philip Hands wrote:

> I'm planning on building new images on Sunday Evening (UK time)
> assuming everything's in place at that point.

At least my changes are in now.

> Here are the differences between what's currently in CVS, and what I'm
> planning to use for building the disks.  I'll include the CONF.sh bit,
> just for completeness.  If someone wants to explain how I'd go about
> checking the rest of this into CVS, go ahead, or alternatively could
> someone do it for me please.

While doing a little update of the README, I also checked in some of your
stuff that seemed appropriate. See the complete diff below.

> The main points are:
>   * make the version "2.2 r0" as per recent discussions here.
>   * make BINVOLID use "Bin-$$num" to keep it under 32 chars long,
>     and use ppc in place of powerpc for the same reason

I've changed Source-X to Src-X too, to maintain consistency.

>   * make pi-makelist for source CDs
>   * add-bin-doc: use version up to first space to generate the 
>                  dedication filename

Took it a bit more general; now removes everything after space, _ or 'r', so
that it works no matter what DEBVERSION you have.

>   * boot-powerpc.calc: tune the size of CD#1

[Raphael: should I update debian/changelog for this kind of stuff, and if yes,
how? Add a new 2.2.3 version?]


Oh, and a related thing: you may want to place the official images in a
2.2_rev0 directory (instead of 2.2_r0) to make clear it's a revision instead
of a release. Shouldn't break anything except documentation that only 
mentiones 2.1 anyway ;-)


Regards,
  Anne Bezemer


Index: debian-cd/CONF.sh
===================================================================
RCS file: /cvs/debian-boot/debian-cd/CONF.sh,v
retrieving revision 1.10
diff -r1.10 CONF.sh
12,13c12,13
< # Version number
< export DEBVERSION="2.2"
---
> # Version number, "2.2 r0", "2.2 r1" etc.
> export DEBVERSION="2.2 r0"
Index: debian-cd/Makefile
===================================================================
RCS file: /cvs/debian-boot/debian-cd/Makefile,v
retrieving revision 1.24
diff -r1.24 Makefile
38c38,42
< BINVOLID="Debian $(DEBVERSION) $(ARCH) Binary-$$num"
---
> ifeq ($(ARCH),powerpc)
> BINVOLID="Debian $(DEBVERSION) ppc Bin-$$num"
> else
> BINVOLID="Debian $(DEBVERSION) $(ARCH) Bin-$$num"
> endif
41c45
< SRCVOLID="Debian $(DEBVERSION) Source-$$num"
---
> SRCVOLID="Debian $(DEBVERSION) Src-$$num"
335c339
< 	@nb=`ls -l $(BDIR)/*.packages | wc -l | tr -d " "`; num=0;\
---
> 	@nb=`ls -l $(BDIR)/?.packages | wc -l | tr -d " "`; num=0;\
365c369
< 	@nb=`ls -l $(SDIR)/*.sources | wc -l | tr -d " "`; num=0;\
---
> 	@nb=`ls -l $(SDIR)/?.sources | wc -l | tr -d " "`; num=0;\
Index: debian-cd/build_all.sh
===================================================================
RCS file: /cvs/debian-boot/debian-cd/build_all.sh,v
retrieving revision 1.7
diff -r1.7 build_all.sh
48a49,50
> 		echo Generating list files for images
> 		make pi-makelist
Index: debian-cd/data/potato/README.html.in
===================================================================
RCS file: /cvs/debian-boot/debian-cd/data/potato/README.html.in,v
retrieving revision 1.4
diff -r1.4 README.html.in
314,315c314,322
<  Translations of the <i>Installation Manual</i>, various other documents, 
<  and just everything else needed for the installation can be found on
---
>  Translations of the <i>Installation Manual</i>, and plain-text and PDF
>  versions, are also available in the 
>  <P>
>  <tt>&nbsp;
>  <A href="install/doc/">/install/doc</a></tt>
>  <P>
>  directory, along with various other documents.
>  <P>
>  Programs and other files that are needed for the installation can be found on
559c566
< =================
---
> ================
701c708
< Last Modified: Fri Jun 30 11:06:02 CEST 2000
---
> Last Modified: Sat Aug 12 10:53:29 CEST 2000
Index: debian-cd/data/woody/README.html.in
===================================================================
RCS file: /cvs/debian-boot/debian-cd/data/woody/README.html.in,v
retrieving revision 1.4
diff -r1.4 README.html.in
314,315c314,322
<  Translations of the <i>Installation Manual</i>, various other documents, 
<  and just everything else needed for the installation can be found on
---
>  Translations of the <i>Installation Manual</i>, and plain-text and PDF
>  versions, are also available in the 
>  <P>
>  <tt>&nbsp;
>  <A href="install/doc/">/install/doc</a></tt>
>  <P>
>  directory, along with various other documents.
>  <P>
>  Programs and other files that are needed for the installation can be found on
319c326
<  <A href=%%""dists/potato/main/disks-ARCH/%%"">/dists/potato/main/disks-ARCH</a>
---
>  <A href=%%""dists/woody/main/disks-ARCH/%%"">/dists/woody/main/disks-ARCH</a>
566c573
< =================
---
> ================
708c715
< Last Modified: Fri Jun 30 11:17:16 CEST 2000
---
> Last Modified: Sat Aug 12 11:09:43 CEST 2000
Index: debian-cd/debian/CONF.sh
===================================================================
RCS file: /cvs/debian-boot/debian-cd/debian/CONF.sh,v
retrieving revision 1.7
diff -r1.7 CONF.sh
7,8c7,8
< # Version number, 2.2 or 2.2_r3 etc.
< export DEBVERSION="2.2"
---
> # Version number, "2.2 r0", "2.2 r1" etc.
> export DEBVERSION="2.2 r0"
29a30,34
> 
> # And this option will make you 2 copies of CD1 - one with all the
> # non-US packages on it, one with none. Useful if you're likely to
> # need both.
> #export FORCENONUSONCD1=1
Index: debian-cd/tools/add-bin-doc
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/add-bin-doc,v
retrieving revision 1.2
diff -r1.2 add-bin-doc
9a10,11
> DEBMAINVER="`echo $DEBVERSION | sed -e 's/[ _r].*//'`"
> 
16,18c18,20
< 	if [ -f $dir/doc/dedication-$DEBVERSION.txt ]; then
< 		mv $dir/doc/dedication-$DEBVERSION.txt $dir/dedication.txt
< 		ln -s ../dedication.txt $dir/doc/dedication-$DEBVERSION.txt
---
> 	if [ -f $dir/doc/dedication-$DEBMAINVER.txt ]; then
> 		mv $dir/doc/dedication-$DEBMAINVER.txt $dir/dedication.txt
> 		ln -s ../dedication.txt $dir/doc/dedication-$DEBMAINVER.txt
Index: debian-cd/tools/boot/potato/boot-powerpc.calc
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/potato/boot-powerpc.calc,v
retrieving revision 1.2
diff -r1.2 boot-powerpc.calc
1c1
< BOOT_SIZE_1=120
---
> BOOT_SIZE_1=50

Reply to:

Follow-Ups:
- Maintaining debian-cd
  - From: Raphael Hertzog <rhertzog@hrnet.fr>

References:
- Re: Release: things to do ???
  - From: Philip Hands <phil@hands.com>

Prev by Date: Re: Question for the boot floppies team.
Next by Date: Maintaining debian-cd
Previous by thread: Re: Release: things to do ???
Next by thread: Maintaining debian-cd
Index(es):
- Date
- Thread