From e44be9972f80fb31c08a7c87b478966caffaa8fa Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Tue, 9 Jun 2015 17:40:11 +0200
Subject: [PATCH] Replace references to wheezy with jessie + add stretch to zsh
 completion

---
 docs/grml-live.txt              | 14 +++++++-------
 etc/grml/grml-live.conf         |  4 ++--
 etc/zsh/completion.d/_grml-live |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 55736bb..3524115 100644
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -205,7 +205,7 @@ Specify name of the release.
 
 Specify the Debian suite you want to use for your live-system. If unset defaults
 to "testing". Supported values are: stable, testing, unstable (or their
-corresponding release names like "wheezy"). Please be aware that recent Debian
+corresponding release names like "jessie"). Please be aware that recent Debian
 suites might require a recent base.tgz
 (${GRML_FAI_CONFIG}/config/basefiles/$CLASSNAME.tar.gz) or a recent version of
 debootstrap.
@@ -497,9 +497,9 @@ The easiest way to get a running grml-live setup is to just use Grml.
 Of course using grml-live on a plain, original Debian installation is supported
 as well. So there we go.
 
-What we have: plain, original Debian wheezy (7.x).
+What we have: plain, original Debian jessie (8.x).
 
-What we want: build a Grml ISO based on Debian/wheezy for the amd64 architecture
+What we want: build a Grml ISO based on Debian/jessie for the amd64 architecture
 using grml-live.
 
 Instructions
@@ -541,7 +541,7 @@ Instructions
   # CHROOT_INSTALL="/etc/grml/fai/chroot_install"
   ## adjust if necessary (defaults to /grml/grml-live):
   ## OUTPUT="/srv/grml-live"
-  FAI_DEBOOTSTRAP="wheezy http://ftp.debian.org/debian/"
+  FAI_DEBOOTSTRAP="jessie http://ftp.debian.org/debian/"
   # ARCH="amd64"
   CLASSES="GRMLBASE,GRML_FULL,AMD64"
   EOF
@@ -654,7 +654,7 @@ How do I create a base.tgz?
 First of all create the chroot using debootstrap:
 
   BASECHROOT='/tmp/basefile'
-  debootstrap wheezy "$BASECHROOT" http://ftp.debian.org/debian
+  debootstrap jessie "$BASECHROOT" http://ftp.debian.org/debian
   tar -C "$BASECHROOT" --exclude='var/cache/apt/archives/*.deb' -zcf base.tar.gz ./
 
 [TIP]
@@ -687,7 +687,7 @@ FAI_DEBOOTSTRAP:
   [...]
   APT_PROXY="http://localhost:3142/"
   [...]
-  FAI_DEBOOTSTRAP="wheezy http://localhost:3142/ftp.debian.org/debian wheezy main contrib non-free"
+  FAI_DEBOOTSTRAP="jessie http://localhost:3142/ftp.debian.org/debian jessie main contrib non-free"
 
 Make sure apt-cacher-ng is running ('/etc/init.d/apt-cacher-ng restart').
 That's it.  All downloaded files will be cached in /var/cache/apt-cacher-ng then.
@@ -714,7 +714,7 @@ How do I create a base tar.gz (I386.tar.gz or AMD64.tar.gz)
 Execute the following commands (requires root):
 
   ARCH='amd64' # replace with i386 if necessary
-  SUITE='wheezy' # using the current stable release should always work
+  SUITE='jessie' # using the current stable release should always work
   debootstrap --arch "$ARCH" --exclude=info,tasksel,tasksel-data "$SUITE" "$ARCH" http://debian.netcologne.de/debian
   cd "$ARCH"
   rm var/cache/apt/archives/*.deb
diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 230dc86..bc13795 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -49,7 +49,7 @@
 
 # Which Debian suite/release do you want to use?
 # Supported values are: stable, testing, unstable (or their corresponding release
-# names like "wheezy").
+# names like "jessie").
 # Unless it is set it defaults to "testing".
 # SUITE="unstable"
 
@@ -66,7 +66,7 @@
 
 # Which Debian suite and which mirror do you want to use for debootstrapping?
 # Usage: "<suite> <mirror>"
-# FAI_DEBOOTSTRAP="wheezy http://ftp.debian.org/debian"
+# FAI_DEBOOTSTRAP="jessie http://ftp.debian.org/debian"
 
 # Do you want to use a local mirror (like NFS)?
 # If so specify the directory where debian/ is available:
diff --git a/etc/zsh/completion.d/_grml-live b/etc/zsh/completion.d/_grml-live
index f2ce3ca..ef2ef93 100644
--- a/etc/zsh/completion.d/_grml-live
+++ b/etc/zsh/completion.d/_grml-live
@@ -47,7 +47,7 @@ _grmllive_suites() { #{{{
   local -a suites
 
   suites=(
-    stable testing unstable wheezy jessie sid
+    stable testing unstable wheezy jessie stretch sid
   )
   _wanted list expl 'Debian suite' compadd ${expl} -- ${suites}
 }
-- 
2.1.4