Hi, Cyril Brulebois <[email protected]> wrote (Sat, 28 Aug 2021 01:46:02 +0200): > Steve McIntyre <[email protected]> (2021-08-28): > > I've moved the RC3 images into the "archive" section now that bullseye > > is released. We should update that text to point to the maint 11.0 > > release images instead. > > Apparently there was some early attempt at adressing that kind of moment > within the release cycle, in comments. But that hadn't been touched > since 2009-2010. > > I've tried to address that in the d-i/no-alpha-yet branch, comments > welcome. (The last commit would be reverted when we have an Alpha 1 > published. Looking at the if-stable-release implementation, I decided > not to go for a new definition… switching from one commented-out block > to another seems just easier, even if I reckon this might annoy > translators at some point. I won't stop anyone wanting to implement such > a condition — we would probably define a new tag via images.data ;))
I tried similar yesterday already, but could not get it to work. Today, I copied the mechanism from <if-etchnhalf-released>, and that way it's fairly easy :-)) Patch attached. I would prefer such solution, so we don't need to make the comment-uncomment- dance over and over again... (remember, that translations need to be synced as well) I assume there will be no strong objections against this? Holger -- Holger Wansing <[email protected]> PGP-Fingerprint: 496A C6E8 1442 4B34 8508 3529 59F1 87CA 156E B076
diff --git a/english/devel/debian-installer/images.data b/english/devel/debian-installer/images.data index 09674b32edd..c561f09b849 100644 --- a/english/devel/debian-installer/images.data +++ b/english/devel/debian-installer/images.data @@ -12,6 +12,23 @@ <define-tag shortversion>rc3</define-tag> <define-tag humanversion>Bullseye RC 3</define-tag> +# Define a tag, if an alpha/beta/rc release is out or not +<set-var diversions:_enh=0 /> +<set-var alpha-released="no" /> # Switch this one to "yes" or "no". +# +<define-tag if-alpha-released endtag=required> +<preserve released /> +<set-var %attributes /> +<ifneq "<get-var released />" "<get-var alpha-released />" + "<enter NOenh<get-var diversions:_enh /> />" + "<enter enh<get-var diversions:_enh /> />" /> +%body +<leave /> +<dump enh<get-var diversions:_enh /> /> +<increment diversions:_enh /> +<restore released /> +</define-tag> + # If arches are added here, then also comment them out for the # devel-other-images tag below <define-tag daily-broken-arches></define-tag> diff --git a/english/devel/debian-installer/index.wml b/english/devel/debian-installer/index.wml index cf8b876ec31..fdfffc9adaf 100644 --- a/english/devel/debian-installer/index.wml +++ b/english/devel/debian-installer/index.wml @@ -34,18 +34,25 @@ developed for the next Debian release and will install Debian testing </p> </div> -<if-stable-release release="bullseye"> +<!-- Shown in the beginning of the release cycle: no Alpha/Beta/RC released yet.--> +<if-alpha-released released="no"> +<p> + +<strong>To install Debian testing</strong>, we recommend you use +the <strong>daily builds</strong> of the installer. The following images are available for +daily builds: + +</if-alpha-released> + +<!-- Shown later in the release cycle: Alpha/Beta/RC available, point at the latest one.--> +<if-alpha-released released="yes"> <p> <strong>To install Debian testing</strong>, we recommend you use the <strong><humanversion /></strong> release of the installer, after checking its <a href="errata">errata</a>. The following images are available for <humanversion />: -<!-- -<strong>To install Debian testing</strong>, we recommend you use -the <strong>daily builds</strong> of the installer. The following images are available for -daily builds: ---> + </p> <h2>Official release</h2> @@ -135,16 +142,16 @@ which uses the same version of the installer as the last release: </div> </div> +</if-alpha-released> -</if-stable-release> -<!-- +<if-alpha-released released="yes"> <p> If you prefer to use the latest and greatest, either to help us test a future release of the installer or because of hardware problems or other issues, try one of these <strong>daily built images</strong> which contain the latest available version of installer components. </p> ---> +</if-alpha-released> <h2>Current daily snapshots</h2>
