From c649f77c215a622d5edb4e1515a23d74a3b81e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Tue, 10 Jul 2001 09:57:43 +0000 Subject: [PATCH] * Updated Woody version number. * Build woody CDs by default. * Updated documentation. --- CONF.sh | 4 ++-- README | 30 ++++++++++++++++++++++++++++-- data/woody/README.html.in | 2 +- debian/CONF.sh | 6 +++--- debian/changelog | 4 +++- 5 files changed, 37 insertions(+), 9 deletions(-) diff --git a/CONF.sh b/CONF.sh index 2a7a9908..d8ef3eeb 100644 --- a/CONF.sh +++ b/CONF.sh @@ -7,10 +7,10 @@ export BASEDIR=`pwd` # Building potato cd set ... -export CODENAME=potato +export CODENAME=woody # Version number, "2.2 r0", "2.2 r1" etc. -export DEBVERSION="2.2 r0" +export DEBVERSION="3.0 prerelease" # Official or non-official set. # NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE diff --git a/README b/README index 878ecaa4..13a8be64 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ YACS - Yet Another CD Script :-) ================================ (better known as debian-cd) -Copyright 1999 Raphaël Hertzog +Copyright 1999-2001 Raphaël Hertzog This set of tools is licensed under the General Public License version 2 or any later version. You can find it in /usr/share/common-licenses/GPL on a Debian GNU system. @@ -52,7 +52,8 @@ $ make official_images $ make bin-official_images ] But you really should consider reading further for more information. - +You can also give a look at build.sh and build_all.sh for an automatized +way of building CD images. How to build a CD set - step by step ==================================== @@ -183,11 +184,36 @@ The process of building a CD is decomposed as follow : $ make bin-images And "make src-images" will generate the sources images. + Note: I use here make images, but you could as well use make + official_images since the latter is the same as the former with + some dependencies on targets that you already launched + (make bootable packages sources). + - if you want to generate a MD5SUMS file with the md5sums of the images you can do it with : $ make imagesums +Official images +=============== + +If you use make official_images you're building CD images that have +the same properties than official CD images but they still doesn't +have the name of "Official Images". The name of the images is given +by setting the OFFICIAL and DEBVERSION environment variable (check +CONF.sh). + +Please never ever use the "Official" name for a CD image that you +built yourself. The only images that can be called "Official" are the +ones built by Debian itself and which are provided on Debian's +servers. + +The default configuration shipped with this package will automatically +name the images "Unofficial". CD will work exactly in the same way +with all Debian tools, only the label is different. That means you +can use build.sh and build_all.sh to build your "Unofficial" images +without modifying anything. + Local packages ============== diff --git a/data/woody/README.html.in b/data/woody/README.html.in index bdd02a83..43ed7ad8 100644 --- a/data/woody/README.html.in +++ b/data/woody/README.html.in @@ -436,7 +436,7 @@ Installing #if DISKNUM1 && TYPEbinary If you are already running an older version of the Debian GNU/Linux - Operating System, you may want to upgrade to version 2.3. + Operating System, you may want to upgrade to version 3.0.

At this moment, woody-specific upgrade procedures are not yet available. In the mean time, use the potato procedures, available diff --git a/debian/CONF.sh b/debian/CONF.sh index ad231a28..41394de0 100644 --- a/debian/CONF.sh +++ b/debian/CONF.sh @@ -1,11 +1,11 @@ # The debian-cd dir export BASEDIR=/usr/share/debian-cd -# Building potato cd set ... -export CODENAME=potato +# Building woody cd set ... +export CODENAME=woody # Version number, "2.2 r0", "2.2 r1" etc. -export DEBVERSION="2.2 r0" +export DEBVERSION="3.0 prerelease" # Official or non-official set. # NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE diff --git a/debian/changelog b/debian/changelog index c00ffa6c..e996e9da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ -debian-cd (2.2.6) unstable; urgency=low +debian-cd (2.2.6) unstable; urgency=medium * UNRELEASED * Updated tasks/base-woody to be in sync with debootstrap 0.1.15. + * Improved documentation about Official images. Closes: #101578 + * Build woody CD set by default now. Updated CONF.sh accordingly. -- Raphael Hertzog Tue, 19 Jun 2001 00:43:04 +0200