From 17b0ad94effcc565d7c6f029b9a082f1e5fdd141 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Fri, 9 Jul 2010 11:54:19 +0000
Subject: [PATCH] Don't reset the value of  by default

---
 CONF.sh          | 2 +-
 debian/changelog | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONF.sh b/CONF.sh
index 6e5f10b8..979f00d8 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -205,7 +205,7 @@ export DISKTYPE=CD
 export TASK_LANGLIST=tasksel_d-i.languages
 
 # Extra variants to enable. See docs/README.variants for more information.
-export VARIANTS=
+# export VARIANTS=
 
 # We don't want certain packages to take up space on CD1...
 #export EXCLUDE1=exclude
diff --git a/debian/changelog b/debian/changelog
index b4ed622d..dbb1d33a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ debian-cd (3.1.4) UNRELEASED; urgency=low
   [ Ian Campbell ]
   * boot-x86: detect duplicates in the extra images used for installation
     and replace with hard links.
+  * CONF.sh: Don't reset the value of $VARIANTS by default.
 
  -- Steve McIntyre <93sam@debian.org>  Tue, 27 Feb 2010 12:24:29 +0100