From 0454b4c9172066a2db3c099744a3fc4d3e38a766 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Wed, 8 Aug 2007 09:54:04 +0000
Subject: [PATCH] Merged in patch from Otavio: * Fix extranonfree support to be
 backward compatible with previous   behaviour (default to false)

---
 debian/changelog         | 4 ++++
 tools/make_disc_trees.pl | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3989f639..24c31522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,10 @@ debian-cd (3.0.3) UNRELEASED; urgency=low
   * Parse isolinux.cfg case-insensatively.
   * Merge boot-i386 and boot-amd64 into boot-x86.
 
+  [ Otavio Salvador ]
+  * Fix extranonfree support to be backward compatible with previous
+    behaviour (default to false)
+
  -- Joey Hess <joeyh@debian.org>  Tue, 07 Aug 2007 18:57:05 -0700
 
 debian-cd (3.0.2) unstable; urgency=high
diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl
index c6f61d5f..7ea92d4d 100755
--- a/tools/make_disc_trees.pl
+++ b/tools/make_disc_trees.pl
@@ -38,7 +38,7 @@ if (defined($ENV{'MAXCDS'})) {
 if (defined($ENV{'EXTRANONFREE'})) {
 	$extranonfree = $ENV{'EXTRANONFREE'};
 } else {
-	$extranonfree = 1;
+	$extranonfree = 0;
 }
 	
 my $list = "$tdir/list";