From 916440cf9a265370facae13776213aefaa8a28d6 Mon Sep 17 00:00:00 2001
From: Tollef Fog Heen <tfheen@debian.org>
Date: Sat, 7 Dec 2002 10:22:40 +0000
Subject: [PATCH] add support for excluding contrib.

---
 CONF.sh             |  4 ++++
 debian/changelog    |  4 +++-
 tools/apt-selection |  8 +++++---
 tools/scanpackages  | 13 ++++++++-----
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/CONF.sh b/CONF.sh
index c024b7a1..efe1014f 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -6,6 +6,7 @@
 unset NONUS             || true
 unset FORCENONUSONCD1   || true
 unset NONFREE           || true
+unset CONTRIB           || true
 unset EXTRANONFREE      || true
 unset LOCAL             || true
 unset LOCALDEBS         || true
@@ -81,6 +82,9 @@ export APTTMP=/ftp/tmp/apt
 # Do I want to have NONFREE merged in the CD set
 # export NONFREE=1
 
+# Do I want to have CONTRIB merged in the CD set
+export CONTRIB=1
+
 # Do I want to have NONFREE on a separate CD (the last CD of the CD set)
 # WARNING: Don't use NONFREE and EXTRANONFREE at the same time !
 # export EXTRANONFREE=1
diff --git a/debian/changelog b/debian/changelog
index fb17de11..897c4110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ debian-cd (2.2.16) unstable; urgency=low
     task mechanism, cf tasks/debian-installer for the current list)
   * Added all files for sarge (in tasks/ data/ and tools/).
   * Updated isolinux.bin from syslinux 1.75-1.
+  * Make it possible to exclude contrib from the CDs.  Useful if you only
+    have a mirror of main.
 
- -- Raphael Hertzog <hertzog@debian.org>  Thu, 10 Oct 2002 14:52:15 +0200
+ -- Tollef Fog Heen <tfheen@debian.org>  Sat,  7 Dec 2002 10:58:53 +0100
 
 debian-cd (2.2.15) unstable; urgency=low
 
diff --git a/tools/apt-selection b/tools/apt-selection
index 612dee10..8abcb1cf 100755
--- a/tools/apt-selection
+++ b/tools/apt-selection
@@ -28,10 +28,12 @@ options=" -q -o Dir::State::status=$APTTMP/$CODENAME-$ARCH/status \
 	  -o APT::Cache::AllVersions=0 \
 	  -o APT::Architecture=$ARCH "
 
+sections=main
 if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then
-	sections="main contrib non-free"
-else
-	sections="main contrib"
+	sections="$sections non-free"
+fi
+if [ "${CONTRIB:-0}" != "0" ]; then
+	sections="$sections contrib"
 fi
 
 # Check for the necessary dirs and files ...
diff --git a/tools/scanpackages b/tools/scanpackages
index 27f48981..b7ebca9f 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -13,12 +13,15 @@ BDIR=$TDIR/$CODENAME-$ARCH
 
 PREFIX=`echo $2 | sed "s?$BDIR/CD?$BDIR/?"`
 
+SECTIONS="main"
+SECTIONSNONUS="non-US/main"
 if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then
-  SECTIONS="main contrib non-free"
-  SECTIONSNONUS="non-US/main non-US/contrib non-US/non-free"
-else
-  SECTIONS="main contrib"
-  SECTIONSNONUS="non-US/main non-US/contrib"
+  SECTIONS="${SECTIONS} non-free"
+  SECTIONSNONUS="${SECTIONSNONUS} non-US/non-free"
+fi
+if [ "${CONTRIB:-0}" != "0" ]; then
+  SECTIONS="${SECTIONS} contrib"
+  SECTIONSNONUS="${SECTIONSNONUS} non-US/contrib"
 fi
 
 if [ -n "$LOCAL" ]; then