From 98cab0af4f596d4645109426d6ea3ea618c7e910 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 4 Mar 2009 17:37:38 +0100 Subject: [PATCH] Drop sarge from interface, docs and script --- config | 5 ++--- debian/changelog | 4 ++-- grml-debootstrap | 9 +++++---- grml-debootstrap.8.txt | 16 +++++++--------- releasetable-man.txt | 2 -- releasetable.txt | 1 - 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/config b/config index 10d318e..ce68e20 100644 --- a/config +++ b/config @@ -71,8 +71,8 @@ CHROOTMIRROR='ftp://ftp.debian.de/debian' # GRMLPACKAGES='grml-etc-core' # release (which Debian version should be installed) -# supported values: sarge (not recommended), etch (old-stable), -# lenny (stable), squeeze (testing), sid (unstable) +# supported values: etch (old-stable), lenny (stable), +# squeeze (testing), sid (unstable) RELEASE='lenny' # architecture @@ -155,7 +155,6 @@ LOCALES='yes' TIMEZONE='Europe/Vienna' # generate initrd via update-initramfs? -# notice: won't do anything when release is sarge as update-initramfs does not exist there INITRD='yes' ## END OF FILE ################################################################# diff --git a/debian/changelog b/debian/changelog index d31b46d..709feba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,11 +3,11 @@ grml-debootstrap (0.24) unstable; urgency=low * Update documentation. * Use configure $MIRROR and $HOSTNAME as defaults in interactive script. - * Add initial support for Debian/squeeze. + * Add initial support for Debian/squeeze and drop sarge instead. * Update VCS*-headers and long description of Debian package. * Move asciidoc, docbook-xsl, xsltproc to Build-Depends-Indep. - -- Michael Prokop Wed, 04 Mar 2009 17:13:54 +0100 + -- Michael Prokop Wed, 04 Mar 2009 17:37:16 +0100 grml-debootstrap (0.23) unstable; urgency=low diff --git a/grml-debootstrap b/grml-debootstrap index 10dbb5b..233e53a 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -254,12 +254,13 @@ prompt_for_bootmanager() # ask for Debian release {{{ prompt_for_release() { - RELEASE="$(dialog --stdout --title "${PN}" --default-item etch --menu \ + RELEASE="$(dialog --stdout --title "${PN}" --default-item lenny --menu \ "Please enter the Debian release you would like to use for installation:" \ 0 50 3 \ - etch Debian/stable \ - lenny Debian/testing \ - sid Debian/unstable)" + etch Debian/old-stable \ + lenny Debian/stable \ + squeeze Debian/testing \ + sid Debian/unstable)" } # }}} diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt index 87c4519..a36f107 100644 --- a/grml-debootstrap.8.txt +++ b/grml-debootstrap.8.txt @@ -117,9 +117,9 @@ Options and environment variables *-r*, *--release* <_releasename_>:: - Specify release of new Debian system. Supported releases: sarge (not - recommended though), etch, lenny, squeeze (note: requires current version of - debootstrap) and sid. Corresponding with configuration variable RELEASE. + Specify release of new Debian system. Supported releases: etch, lenny, + squeeze (note: requires current version of debootstrap) and sid. + Corresponding with configuration variable RELEASE. *--scripts* <_directory_>:: @@ -257,8 +257,7 @@ Again, use grub syntax for specifying. Usage example: groot=hd0,0 release=... Specify release of new Debian system. Defaults to Debian stable. Supported -relases: sarge (not recommended though), etch, lenny, squeeze and sid. Usage -example: release=sid +relases: etch, lenny, squeeze and sid. Usage example: release=sid mirror=... @@ -292,12 +291,11 @@ Supported Releases include::releasetable.txt[] [NOTE] -.Sarge-Release +.Etch-Release ================================================================================ [1] Please notice that Etch is the current old-stable within Debian. -grml-debootstrap can handle the release (as well as sarge) but you really should -not use Etch anymore unless you really know what you are doing. Choose Lenny -instead. +grml-debootstrap can handle the release but you really should not use Etch +anymore unless you really know what you are doing. Choose Lenny instead. ================================================================================ Bugs diff --git a/releasetable-man.txt b/releasetable-man.txt index 81b5e58..871a8fc 100644 --- a/releasetable-man.txt +++ b/releasetable-man.txt @@ -3,8 +3,6 @@ Current status: +----------------+-------------+-----------------+ | Release / Tool | debootstrap | cdebootstrap | +----------------+-------------+-----------------+ - | Sarge | works [1] | works [1] | - +----------------+-------------+-----------------+ | Etch | works [1] | works [1] | +----------------+-------------+-----------------+ | Lenny | works | works | diff --git a/releasetable.txt b/releasetable.txt index 64efab7..434468b 100644 --- a/releasetable.txt +++ b/releasetable.txt @@ -3,7 +3,6 @@ '---------.-----------------.--------------- Release / Tool debootstrap cdebootstrap -------------------------------------------- -Sarge works[1] works[1] Etch works works Lenny works works Squeeze works works -- 2.1.4